diff --git a/common/models/user.js b/common/models/user.js
index 5a246049..69d94710 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -293,8 +293,9 @@ module.exports = function(User) {
   User.logout = function(tokenId, fn) {
     fn = fn || utils.createPromiseCallback();
 
+    var err;
     if (!tokenId) {
-      var err = new Error(g.f('{{accessToken}} is required to logout'));
+      err = new Error(g.f('{{accessToken}} is required to logout'));
       err.status = 401;
       process.nextTick(fn, err);
       return fn.promise;
@@ -304,7 +305,7 @@ module.exports = function(User) {
       if (err) {
         fn(err);
       } else if ('count' in info && info.count === 0) {
-        var err = new Error(g.f('Could not find {{accessToken}}'));
+        err = new Error(g.f('Could not find {{accessToken}}'));
         err.status = 401;
         fn(err);
       } else {
@@ -867,10 +868,9 @@ module.exports = function(User) {
     if (ctx.isNewInstance) return next();
     if (!ctx.where && !ctx.instance) return next();
     var pkName = ctx.Model.definition.idName() || 'id';
-    if (ctx.where) {
-      var where = ctx.where;
-    } else {
-      var where = {};
+    var where = ctx.where;
+    if (!where) {
+      where = {};
       where[pkName] = ctx.instance[pkName];
     }
 
@@ -893,13 +893,14 @@ module.exports = function(User) {
         user['email'] = u['email'];
         return user;
       });
+      var emailChanged;
       if (ctx.instance) {
-        var emailChanged = ctx.instance.email !== ctx.hookState.originalUserData[0].email;
+        emailChanged = ctx.instance.email !== ctx.hookState.originalUserData[0].email;
         if (emailChanged && ctx.Model.settings.emailVerificationRequired) {
           ctx.instance.emailVerified = false;
         }
       } else if (ctx.data.email) {
-        var emailChanged = ctx.hookState.originalUserData.some(function(data) {
+        emailChanged = ctx.hookState.originalUserData.some(function(data) {
           return data.email != ctx.data.email;
         });
         if (emailChanged && ctx.Model.settings.emailVerificationRequired) {
diff --git a/package.json b/package.json
index fdf38684..c2d3ac78 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "chai": "^3.5.0",
     "cookie-parser": "^1.3.4",
     "dirty-chai": "^1.2.2",
-    "eslint-config-loopback": "^7.0.1",
+    "eslint-config-loopback": "^8.0.0",
     "express-session": "^1.14.0",
     "grunt": "^1.0.1",
     "grunt-browserify": "^5.0.0",