diff --git a/server/server.js b/server/server.js
index a1d0ce08d1..5529bec38f 100755
--- a/server/server.js
+++ b/server/server.js
@@ -216,9 +216,12 @@ var passportOptions = {
     var password = generateKey('password');
     var userObj = {
       username: username,
-      password: password,
-      email: email
+      password: password
     };
+
+    if (email) {
+      userObj.email = email;
+    }
     return userObj;
   }
 };