diff --git a/src/Transaction.cpp b/src/Transaction.cpp
index fb37f53d5a..303b267a15 100644
--- a/src/Transaction.cpp
+++ b/src/Transaction.cpp
@@ -269,10 +269,10 @@ Transaction::pointer Transaction::setPasswordFund(
 	const NewcoinAddress&	naPrivateKey,
 	const NewcoinAddress&	naDstAccountID)
 {
-	sign(naPrivateKey);
-
 	mTransaction->setITFieldAccount(sfDestination, naDstAccountID);
 
+	sign(naPrivateKey);
+
 	return shared_from_this();
 }
 
@@ -300,7 +300,7 @@ Transaction::pointer Transaction::setPasswordSet(
 	const std::vector<unsigned char>&	vucPubKey,
 	const std::vector<unsigned char>&	vucSignature)
 {
-	mTransaction->setITFieldAccount(sfDestination, naAuthKeyID);
+	mTransaction->setITFieldAccount(sfAuthorizedKey, naAuthKeyID);
 	mTransaction->setITFieldVL(sfGenerator, vucGenerator);
 	mTransaction->setITFieldVL(sfPubKey, vucPubKey);
 	mTransaction->setITFieldVL(sfSignature, vucSignature);
@@ -326,6 +326,7 @@ Transaction::pointer Transaction::sharedPasswordSet(
 
 	return tResult->setPasswordSet(naPrivateKey, naAuthKeyID, vucGenerator, vucPubKey, vucSignature);
 }
+
 //
 // Payment
 //