diff --git a/programs/mutant-5/swen90006/passbook/PassBook.java b/programs/mutant-5/swen90006/passbook/PassBook.java
index 5b0ae78f8f0b09bfbe0570a206c758ae315eba12..3e95eacb92937e614ab7f3997b26ad3f9bf27d64 100644
--- a/programs/mutant-5/swen90006/passbook/PassBook.java
+++ b/programs/mutant-5/swen90006/passbook/PassBook.java
@@ -84,6 +84,9 @@ public class PassBook
 	}
 	//check the passphrase strength
 	else {
+	    	if(passbookUsername.length()<1) {
+			throw new WeakPassphraseException(passphrase);
+		}
 	    if (passphrase.length() < MINIMUM_PASSPHRASE_LENGTH) {
 		throw new WeakPassphraseException(passphrase);
 	    }
@@ -109,7 +112,7 @@ public class PassBook
 	    }
 	}
 
-	passphrases.put(passphrase, passbookUsername);
+	passphrases.put(passbookUsername, passphrase);
 	PasswordTable pt = new PasswordTable();
 	details.put(passbookUsername, pt);
     }