diff --git a/src/login.js b/src/login.js
index 79e02eab65..0d133804fa 100644
--- a/src/login.js
+++ b/src/login.js
@@ -34,8 +34,10 @@ var user = require('./user'),
 							message: "user-banned"
 						});
 					}
+					console.log(password);
+					console.log(JSON.stringify(userData));
 
-					bcrypt.compare(password, userData.password, function(err, res) {
+					bcrypt.compare(password, userData.password || '', function(err, res) {
 						if (err) {
 							winston.err(err.message);
 							next(new Error('bcrypt compare error'));
diff --git a/src/user.js b/src/user.js
index b77ceb251f..ccebb0d66e 100644
--- a/src/user.js
+++ b/src/user.js
@@ -84,6 +84,7 @@ var bcrypt = require('bcrypt'),
 
 				var gravatar = User.createGravatarURLFromEmail(userData.email);
 				var timestamp = Date.now();
+				var password = userData.password;
 
 				userData = {
 					'uid': uid,
@@ -127,8 +128,8 @@ var bcrypt = require('bcrypt'),
 				// Join the "registered-users" meta group
 				groups.joinByGroupName('registered-users', uid);
 
-				if (userData.password) {
-					User.hashPassword(userData.password, function(err, hash) {
+				if (password) {
+					User.hashPassword(password, function(err, hash) {
 						User.setUserField(uid, 'password', hash);
 						callback(null, uid);
 					});