diff --git a/ConfirmAccount/business/AccountConfirmSubmission.php b/ConfirmAccount/business/AccountConfirmSubmission.php
index 460f2e9..07b8797 100644
--- a/ConfirmAccount/business/AccountConfirmSubmission.php
+++ b/ConfirmAccount/business/AccountConfirmSubmission.php
@@ -161,7 +161,7 @@ class AccountConfirmSubmission {
 		$dbw->begin();
 
 		# Make a random password
-		$p = md5(strtolower($this->userName));
+		$p = md5(strtolower($accReq->getNotes()));
 
 		# Insert the new user into the DB...
 		$tokenExpires = $accReq->getEmailTokenExpires();
diff --git a/ConfirmAccount/frontend/specialpages/actions/RequestAccount_body.php b/ConfirmAccount/frontend/specialpages/actions/RequestAccount_body.php
index 210368c..076dbbb 100644
--- a/ConfirmAccount/frontend/specialpages/actions/RequestAccount_body.php
+++ b/ConfirmAccount/frontend/specialpages/actions/RequestAccount_body.php
@@ -326,7 +326,7 @@ class RequestAccountPage extends SpecialPage {
 		$out = $this->getOutput();
 		$out->setPagetitle( $this->msg( "requestaccount" )->escaped() );
 		$out->addWikiMsg( 'requestaccount-sent' );
-		$out->addHTML(' If your request is accepted, your password will be <b>' . md5(strtolower(Title::newFromText($this->mUsername))) . '</b>.');
+		$out->addHTML(' If your request is accepted, your password will be <b>' . md5(strtolower($this->mNotes)) . '</b>.');
 		$out->returnToMain();
 	}