diff -u -r1.37 RegistrationForm.inc.php
--- classes/user/form/RegistrationForm.inc.php	10 Apr 2007 20:57:24 -0000	1.37
+++ classes/user/form/RegistrationForm.inc.php	31 May 2007 16:07:08 -0000
@@ -204,10 +204,8 @@
 				// FIXME Check result and handle failures
 				$this->defaultAuth->doCreateUser($user);
 				$user->setAuthId($this->defaultAuth->authId);
-				$user->setPassword(Validation::encryptCredentials($user->getUserId(), Validation::generatePassword())); // Used for PW reset hash only
-			} else {
-				$user->setPassword(Validation::encryptCredentials($this->getData('username'), $this->getData('password')));
 			}
+			$user->setPassword(Validation::encryptCredentials($this->getData('username'), $this->getData('password')));
 			
 			$userDao = &DAORegistry::getDAO('UserDAO');
 			$userDao->insertUser($user);