diff --git a/src/js/client.js b/src/js/client.js
index 7e07053a7..acdea3401 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1767,6 +1767,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
     Client.prototype.addUser = function (user, callback) {
         var data = {
             email: user.email,
+            fallbackEmail: user.fallbackEmail,
             displayName: user.displayName,
             role: user.role
         };
diff --git a/src/translation/en.json b/src/translation/en.json
index 0fff4dc55..892cb2450 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -243,7 +243,9 @@
             "primaryEmail": "Primary email",
             "recoveryEmail": "Password recovery email",
             "errorDisplayNameRequired": "Name is required",
-            "activeCheckbox": "User is active"
+            "activeCheckbox": "User is active",
+            "displayNamePlaceholder": "Optional. If not provided, user can pick during sign up",
+            "fallbackEmailPlaceholder": "Optional. If not specified, primary email will be used"
         },
         "deleteUserDialog": {
             "title": "Delete user {{ username }}",
diff --git a/src/translation/ru.json b/src/translation/ru.json
index 4fdc122ff..5c92a1ef0 100644
--- a/src/translation/ru.json
+++ b/src/translation/ru.json
@@ -1580,7 +1580,8 @@
         "pl": "Польский",
         "vi": "Вьетнамский",
         "zh_Hans": "Китайский (Упрощенный)",
-        "es": "Испанский"
+        "es": "Испанский",
+        "ru": "Русский"
     },
     "setupAccount": {
         "username": "Имя пользователя",
diff --git a/src/views/users.html b/src/views/users.html
index 02925a831..15804ff3d 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -45,7 +45,7 @@
         <form name="useradd_form" role="form" ng-submit="useradd.submit()" autocomplete="off">
           <div class="form-group" ng-class="{ 'has-error': (useradd_form.displayName.$dirty && useradd_form.displayName.$invalid) || (!useradd_form.displayName.$dirty && useradd.error.displayName) }">
             <label class="control-label">{{ 'users.user.fullName' | tr }}</label>
-            <input type="text" class="form-control" ng-model="useradd.displayName" name="displayName" id="inputUserAddDisplayName" ng-required autofocus autocomplete="off">
+            <input type="text" class="form-control" ng-model="useradd.displayName" name="displayName" id="inputUserAddDisplayName" autofocus autocomplete="off" placeholder="{{ 'users.user.displayNamePlaceholder' | tr }}">
             <div class="control-label" ng-show="(!useradd_form.displayName.$dirty && useradd.error.displayName) || (useradd_form.displayName.$dirty && useradd_form.displayName.$invalid) || (!useradd_form.displayName.$dirty && useradd.error.displayName)">
               <small ng-show="useradd_form.displayName.$error.displayName">{{ 'users.user.errorNotValidFullName' | tr }}</small>
               <small ng-show="!useradd_form.displayName.$dirty && useradd.error.displayName">{{ useradd.error.displayName }}</small>
@@ -54,7 +54,7 @@
 
           <input type="password" style="display: none;">
           <div class="form-group" ng-class="{ 'has-error': (useradd_form.email.$dirty && useradd_form.email.$invalid) || (!useradd_form.email.$dirty && useradd.error.email) }">
-            <label class="control-label">{{ 'users.user.email' | tr }}</label>
+            <label class="control-label">{{ 'users.user.primaryEmail' | tr }}</label>
             <input type="email" class="form-control" ng-model="useradd.email" name="email" id="inputUserAddEmail" required>
             <div class="control-label" ng-show="(!useradd_form.email.$dirty && useradd.error.email) || (useradd_form.email.$dirty && useradd_form.email.$invalid) || (!useradd_form.email.$dirty && useradd.error.email)">
               <small ng-show="useradd_form.email.$error.required">{{ 'users.user.errorEmailRequired' | tr }}</small>
@@ -63,6 +63,16 @@
             </div>
           </div>
 
+          <div class="form-group" ng-class="{ 'has-error': (useradd_form.fallbackEmail.$dirty && useradd_form.fallbackEmail.$invalid) || (!useradd_form.fallbackEmail.$dirty && useradd.error.fallbackEmail) }">
+            <label class="control-label">{{ 'users.user.recoveryEmail' | tr }}</label>
+            <input type="email" class="form-control" ng-model="useradd.fallbackEmail" name="fallbackEmail" id="inputUserAddFallbackEmail" placeholder="{{ 'users.user.fallbackEmailPlaceholder' | tr }}">
+            <div class="control-label" ng-show="(!useradd_form.fallbackEmail.$dirty && useradd.error.fallbackEmail) || (useradd_form.fallbackEmail.$dirty && useradd_form.fallbackEmail.$invalid) || (!useradd_form.fallbackEmail.$dirty && useradd.error.fallbackEmail)">
+              <small ng-show="useradd_form.fallbackEmail.$error.required">{{ 'users.user.errorEmailRequired' | tr }}</small>
+              <small ng-show="useradd_form.fallbackEmail.$error.fallbackEmail">{{ 'users.user.errorInvalidEmail' | tr }}</small>
+              <small ng-show="!useradd_form.fallbackEmail.$dirty && useradd.error.fallbackEmail">{{ useradd.error.fallbackEmail }}</small>
+            </div>
+          </div>
+
           <div class="form-group" ng-class="{ 'has-error': (useradd_form.username.$dirty && useradd_form.username.$invalid) || (!useradd_form.username.$dirty && useradd.error.username) }">
             <label class="control-label">{{ 'users.user.username' | tr }}</label>
             <input type="text" class="form-control" ng-model="useradd.username" name="username" id="inputUserAddUsername" placeholder="{{ 'users.user.usernamePlaceholder' | tr }}">
diff --git a/src/views/users.js b/src/views/users.js
index 22618d11c..f74449ea2 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -126,6 +126,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         alreadyTaken: false,
         error: {},
         email: '',
+        fallbackEmail: '',
         username: '',
         displayName: '',
         selectedGroups: [],
@@ -140,6 +141,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
             $scope.useradd.error = {};
             $scope.useradd.email = '';
+            $scope.useradd.fallbackEmail = '';
             $scope.useradd.username = '';
             $scope.useradd.displayName = '';
             $scope.useradd.selectedGroups = [];
@@ -157,12 +159,14 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
             $scope.useradd.alreadyTaken = false;
             $scope.useradd.error.email = null;
+            $scope.useradd.error.fallbackEmail = null;
             $scope.useradd.error.username = null;
             $scope.useradd.error.displayName = null;
 
             var user = {
                 username: $scope.useradd.username || null,
                 email: $scope.useradd.email,
+                fallbackEmail: $scope.useradd.fallbackEmail,
                 displayName: $scope.useradd.displayName,
                 role: $scope.useradd.role
             };