diff --git a/common/models/user.js b/common/models/user.js
index 8ffacd9d5c..b33b40cdb2 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -661,9 +661,11 @@ module.exports = function(User) {
         return Observable.forkJoin(
           this.update$(updateConfig),
           this.requestAuthEmail(false, newEmail),
-          (user, message) => ({ user, message })
+          (_, message) => message
         )
-        .map(({ message }) => message);
+        .do(() => {
+          Object.assign(this, updateConfig);
+        });
       });
 
     } else {
diff --git a/server/boot/settings.js b/server/boot/settings.js
index e240dd2e48..f2d67628f4 100644
--- a/server/boot/settings.js
+++ b/server/boot/settings.js
@@ -41,7 +41,7 @@ export default function settingsController(app) {
     const { user, body: { email } } = req;
     return user.requestUpdateEmail(email)
       .subscribe(
-        (message) => res.json({ message: message }),
+        message => res.json({ message }),
         next
       );
   }
diff --git a/server/middlewares/email-not-verified-notice.js b/server/middlewares/email-not-verified-notice.js
index 6a4c110f5c..0c53d14797 100644
--- a/server/middlewares/email-not-verified-notice.js
+++ b/server/middlewares/email-not-verified-notice.js
@@ -4,6 +4,7 @@ const ALLOWED_METHODS = ['GET'];
 const EXCLUDED_PATHS = [
   '/api/flyers/findOne',
   '/signout',
+  '/accept-privacy-terms',
   '/update-email',
   '/passwordless-change',
   '/external/services/user'
diff --git a/server/middlewares/privacy-terms-notice.js b/server/middlewares/privacy-terms-notice.js
index 1dc892a7be..ea2a5316ed 100644
--- a/server/middlewares/privacy-terms-notice.js
+++ b/server/middlewares/privacy-terms-notice.js
@@ -2,7 +2,10 @@ const ALLOWED_METHODS = ['GET'];
 const EXCLUDED_PATHS = [
   '/api/flyers/findOne',
   '/signout',
-  '/accept-privacy-terms'
+  '/accept-privacy-terms',
+  '/update-email',
+  '/passwordless-change',
+  '/external/services/user'
 ];
 
 export default function privacyTermsNotAcceptedNotice() {