diff --git a/common/models/user.js b/common/models/user.js
index 62d7bb63f1..3a6e446834 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -80,6 +80,11 @@ module.exports = function(User) {
       if (user.progressTimestamps.length === 0) {
         user.progressTimestamps.push({ timestamp: Date.now() });
       }
+      // this is workaround for preventing a server crash
+      // refer strongloop/loopback/#1364
+      if (user.password === '') {
+        user.password = null;
+      }
     }
     return next();
   });
diff --git a/server/boot/a-extendUser.js b/server/boot/a-extendUser.js
index 8cdbd16972..57e318d14c 100644
--- a/server/boot/a-extendUser.js
+++ b/server/boot/a-extendUser.js
@@ -53,6 +53,11 @@ module.exports = function(app) {
   User.beforeRemote('create', function(ctx, user, next) {
     var body = ctx.req.body;
     if (body) {
+      // this is workaround for preventing a server crash
+      // refer strongloop/loopback/#1364
+      if (body.password === '') {
+        body.password = null;
+      }
       body.emailVerified = false;
     }
     next();