diff --git a/common/models/user.js b/common/models/user.js
index 8695e03a5b..38b76dd5ac 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -472,7 +472,7 @@ module.exports = function(User) {
     }
   );
 
-  User.requestAuthLink = function requestAuthLink(email) {
+  User.requestAuthEmail = function requestAuthEmail(email) {
     if (!isEmail(email)) {
       return Promise.reject(
         new Error('The submitted email not valid.')
@@ -545,7 +545,7 @@ module.exports = function(User) {
   };
 
   User.remoteMethod(
-    'requestAuthLink',
+    'requestAuthEmail',
     {
       description: 'request a link on email with temporary token to sign in',
       accepts: [{
@@ -560,7 +560,7 @@ module.exports = function(User) {
     }
   );
 
-  User.prototype.updateEmail = function updateEmail(email) {
+  User.prototype.requestUpdateEmail = function requestUpdateEmail(email) {
     const ownEmail = email === this.email;
     if (!isEmail('' + email)) {
       return Observable.throw(createEmailError());
diff --git a/common/models/user.json b/common/models/user.json
index 521b36f9bf..5aff4d4e88 100644
--- a/common/models/user.json
+++ b/common/models/user.json
@@ -277,7 +277,7 @@
       "principalType": "ROLE",
       "principalId": "$owner",
       "permission": "ALLOW",
-      "property": "updateEmail"
+      "property": "requestUpdateEmail"
     },
     {
       "accessType": "EXECUTE",
@@ -298,7 +298,7 @@
       "principalType": "ROLE",
       "principalId": "$everyone",
       "permission": "ALLOW",
-      "property": "requestAuthLink"
+      "property": "requestAuthEmail"
     }
   ],
   "methods": {}
diff --git a/server/boot/settings.js b/server/boot/settings.js
index 5a407b080b..9264d16fcb 100644
--- a/server/boot/settings.js
+++ b/server/boot/settings.js
@@ -21,7 +21,7 @@ export default function settingsController(app) {
 
   function updateMyEmail(req, res, next) {
     const { user, body: { email } } = req;
-    return user.updateEmail(email)
+    return user.requestUpdateEmail(email)
       .subscribe(
         (message) => res.json({ message }),
         next
diff --git a/server/boot/user.js b/server/boot/user.js
index e167481e9d..ee7faee3eb 100644
--- a/server/boot/user.js
+++ b/server/boot/user.js
@@ -248,7 +248,7 @@ module.exports = function(app) {
       return res.redirect('/');
     }
 
-    return User.requestAuthLink(req.body.email)
+    return User.requestAuthEmail(req.body.email)
       .then(msg => {
           return res.status(200).send({ message: msg });
       })