diff --git a/src/translation/en.json b/src/translation/en.json
index 5915a99f0..ff3b2e4f3 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -364,7 +364,11 @@
         "changeFallbackEmail": {
             "title": "Change password recovery email address",
             "errorEmailRequired": "A valid email address is required",
-            "errorEmailInvalid": "The Email address is not valid"
+            "errorEmailInvalid": "The Email address is not valid",
+            "email": "New password recovery email address",
+            "password": "Password for confirmation",
+            "errorWrongPassword": "Wrong password",
+            "errorPasswordRequired": "A password is required"
         },
         "changeDisplayName": {
             "title": "Change your display name",
diff --git a/src/views/profile.html b/src/views/profile.html
index 62a5b01ac..74aab7f09 100644
--- a/src/views/profile.html
+++ b/src/views/profile.html
@@ -122,14 +122,24 @@
       </div>
       <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)}">
-            <input type="email" class="form-control" ng-model="fallbackEmailChange.email" id="inputfallbackEmailChangeEmail" name="email" required autofocus>
+            <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)">
               <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>
             </div>
           </div>
+          <div class="form-group" ng-class="{ 'has-error': (!fallbackEmailChangeForm.password.$dirty && fallbackEmailChange.error.password) || (fallbackEmailChangeForm.password.$dirty && fallbackEmailChangeForm.password.$invalid) }">
+            <label class="control-label" for="inputFallbackEmailChangePassword">{{ 'profile.changeFallbackEmail.password' | tr }}</label>
+            <input type="password" class="form-control" ng-model="fallbackEmailChange.password" id="inputFallbackEmailChangePassword" name="password" required autofocus>
+            <div class="control-label" ng-show="(!fallbackEmailChangeForm.password.$dirty && fallbackEmailChange.error.password) || (fallbackEmailChangeForm.password.$dirty && fallbackEmailChangeForm.password.$invalid)">
+              <small ng-show="!fallbackEmailChangeForm.password.$dirty && fallbackEmailChange.error.password">{{ 'profile.changeFallbackEmail.errorWrongPassword' | tr }}</small>
+              <small ng-show="fallbackEmailChangeForm.password.$dirty && fallbackEmailChangeForm.password.$error.required">{{ 'profile.changeFallbackEmail.errorPasswordRequired' | tr }}</small>
+            </div>
+          </div>
           <input class="ng-hide" type="submit" ng-disabled="fallbackEmailChangeForm.$invalid"/>
         </form>
       </div>
diff --git a/src/views/profile.js b/src/views/profile.js
index 7a131759a..85a426779 100644
--- a/src/views/profile.js
+++ b/src/views/profile.js
@@ -337,13 +337,19 @@ angular.module('Application').controller('ProfileController', ['$scope', '$trans
 
     $scope.fallbackEmailChange = {
         busy: false,
-        error: {},
+        error: {
+            email: false,
+            password: false
+        },
         email: '',
+        password: '',
 
         reset: function () {
             $scope.fallbackEmailChange.busy = false;
             $scope.fallbackEmailChange.error.email = null;
+            $scope.fallbackEmailChange.error.password = null;
             $scope.fallbackEmailChange.email = '';
+            $scope.fallbackEmailChange.password = '';
 
             $scope.fallbackEmailChangeForm.$setUntouched();
             $scope.fallbackEmailChangeForm.$setPristine();
@@ -356,16 +362,28 @@ angular.module('Application').controller('ProfileController', ['$scope', '$trans
 
         submit: function () {
             $scope.fallbackEmailChange.error.email = null;
+            $scope.fallbackEmailChange.error.password = null;
             $scope.fallbackEmailChange.busy = true;
 
             var data = {
-                fallbackEmail: $scope.fallbackEmailChange.email
+                fallbackEmail: $scope.fallbackEmailChange.email,
+                password: $scope.fallbackEmailChange.password
             };
 
             Client.updateProfile(data, function (error) {
                 $scope.fallbackEmailChange.busy = false;
 
-                if (error) return console.error('Unable to change fallback email.', error);
+                if (error) {
+                    if (error.statusCode === 412) {
+                        $scope.fallbackEmailChange.error.password = true;
+                        $scope.fallbackEmailChange.password = '';
+                        $scope.fallbackEmailChangeForm.password.$setPristine();
+                        $('#inputFallbackEmailChangePassword').focus();
+                    } else {
+                        console.error('Unable to change fallback email.', error);
+                    }
+                    return;
+                }
 
                 // update user info in the background
                 Client.refreshUserInfo();