Fixed a couple of memory leaks as a result of moving code that used to
populate allocuserpwd and relied on it's clean up.