diff --git a/src/views/profile.html b/src/views/profile.html
index 5478bf441..cc1cc72dd 100644
--- a/src/views/profile.html
+++ b/src/views/profile.html
@@ -123,13 +123,14 @@
       <div class="modal-body">
         <form name="fallbackEmailChangeForm" role="form" novalidate ng-submit="fallbackEmailChange.submit()" autocomplete="off">
           <input type="password" style="display: none;">
-          <div class="form-group" ng-class="{ 'has-error': (fallbackEmailChangeForm.email.$dirty && fallbackEmailChangeForm.email.$invalid) || (!fallbackEmailChangeForm.email.$dirty && fallbackEmailChange.error.email)}">
+          <div class="form-group" ng-class="{ 'has-error': fallbackEmailChange.error.generic || (fallbackEmailChangeForm.email.$dirty && fallbackEmailChangeForm.email.$invalid) || (!fallbackEmailChangeForm.email.$dirty && fallbackEmailChange.error.email)}">
             <label class="control-label" for="inputFallbackEmailChangeEmail">{{ 'profile.changeFallbackEmail.email' | tr }}</label>
             <input type="email" class="form-control" ng-model="fallbackEmailChange.email" id="inputFallbackEmailChangeEmail" name="email" required autofocus>
-            <div class="control-label" ng-show="(!fallbackEmailChangeForm.email.$dirty && fallbackEmailChange.error.email) || (fallbackEmailChangeForm.email.$dirty && fallbackEmailChangeForm.email.$invalid)">
+            <div class="control-label" ng-show="fallbackEmailChange.error.generic || (!fallbackEmailChangeForm.email.$dirty && fallbackEmailChange.error.email) || (fallbackEmailChangeForm.email.$dirty && fallbackEmailChangeForm.email.$invalid)">
               <small ng-show="fallbackEmailChangeForm.email.$error.required">{{ 'profile.changeFallbackEmail.errorEmailRequired' | tr }}</small>
               <small ng-show="(fallbackEmailChangeForm.email.$dirty && fallbackEmailChangeForm.email.$invalid) && !fallbackEmailChangeForm.email.$error.required">{{ 'profile.changeFallbackEmail.errorEmailInvalid' | tr }}</small>
               <small ng-show="!fallbackEmailChangeForm.email.$dirty && fallbackEmailChange.error.email">{{ fallbackEmailChange.error.email }}</small>
+              <small ng-show="fallbackEmailChange.error.generic">{{ fallbackEmailChange.error.generic }}</small>
             </div>
           </div>
           <div class="form-group" ng-class="{ 'has-error': (!fallbackEmailChangeForm.password.$dirty && fallbackEmailChange.error.password) || (fallbackEmailChangeForm.password.$dirty && fallbackEmailChangeForm.password.$invalid) }">
diff --git a/src/views/profile.js b/src/views/profile.js
index 81d79ce00..666c4c0bb 100644
--- a/src/views/profile.js
+++ b/src/views/profile.js
@@ -320,13 +320,15 @@ angular.module('Application').controller('ProfileController', ['$scope', '$trans
                 $scope.emailchange.busy = false;
 
                 if (error) {
-                    if (error.statusCode === 409) {
-                        $scope.emailchange.error.email = 'Email already taken';
-                        $scope.emailChangeForm.email.$setPristine();
-                        $('#inputEmailChangeEmail').focus();
-                    } else {
-                        console.error('Unable to change email.', error);
-                    }
+                    if (error.statusCode === 409) $scope.emailchange.error.email = 'Email already taken';
+                    else if (error.statusCode === 400) $scope.emailchange.error.email = error.message;
+                    else console.error('Unable to change email.', error);
+
+                    $('#inputEmailChangeEmail').focus();
+
+                    $scope.emailChangeForm.$setUntouched();
+                    $scope.emailChangeForm.$setPristine();
+
                     return;
                 }
 
@@ -366,6 +368,7 @@ angular.module('Application').controller('ProfileController', ['$scope', '$trans
         submit: function () {
             $scope.fallbackEmailChange.error.email = null;
             $scope.fallbackEmailChange.error.password = null;
+            $scope.fallbackEmailChange.error.generic = null;
             $scope.fallbackEmailChange.busy = true;
 
             var data = {
@@ -382,9 +385,12 @@ angular.module('Application').controller('ProfileController', ['$scope', '$trans
                         $scope.fallbackEmailChange.password = '';
                         $scope.fallbackEmailChangeForm.password.$setPristine();
                         $('#inputFallbackEmailChangePassword').focus();
+                    } else if (error.statusCode === 400) {
+                        $scope.fallbackEmailChange.error.generic = error.message;
                     } else {
                         console.error('Unable to change fallback email.', error);
                     }
+
                     return;
                 }
 
@@ -529,13 +535,14 @@ angular.module('Application').controller('ProfileController', ['$scope', '$trans
                 $scope.displayNameChange.busy = false;
 
                 if (error) {
-                    if (error.statusCode === 400) {
-                        $scope.displayNameChange.error.displayName = 'Invalid display name';
-                        $scope.displayNameChangeForm.email.$setPristine();
-                        $('#inputDisplayNameChangeDisplayName').focus();
-                    } else {
-                        console.error('Unable to change email.', error);
-                    }
+                    if (error.statusCode === 400) $scope.displayNameChange.error.displayName = error.message;
+                    else console.error('Unable to change email.', error);
+
+                    $('#inputDisplayNameChangeDisplayName').focus();
+
+                    $scope.displayNameChangeForm.$setUntouched();
+                    $scope.displayNameChangeForm.$setPristine();
+
                     return;
                 }