diff --git a/UI/Templates/PreferencesUI/UIxAccountEditor.wox b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
index 5f8ee04a0..8cdbaeb7f 100644
--- a/UI/Templates/PreferencesUI/UIxAccountEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
@@ -53,18 +53,18 @@
                  ng-model="account.password"/>
         </md-input-container>
 
-        <script type="text/javascript">
-          var mailCustomFromEnabled = <var:string value="mailCustomFromEnabled" const:escapeHTML="NO"/>;
-        </script>
-
         <md-input-container>
           <label><var:string label:value="Full Name:"/></label>
-          <input type="text" required="required" ng-model="account.identities[0].fullName"/>
+          <input type="text" required="required"
+                 ng-readonly="customFromIsReadonly()"
+                 ng-model="account.identities[0].fullName"/>
         </md-input-container>
 
         <md-input-container>
           <label><var:string label:value="Email:"/></label>
-          <input type="email" required="required" ng-model="account.identities[0].email"/>
+          <input type="email" required="required"
+                 ng-readonly="customFromIsReadonly()"
+                 ng-model="account.identities[0].email"/>
         </md-input-container>
 
         <md-input-container>
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 0c721fcf5..c21f8f874 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -14,6 +14,10 @@
   <main class="view md-layout-fill" ui-view="preferences" layout="row"
         ng-controller="navController"><!-- preferences --> </main>
 
+      <script type="text/javascript">
+        var mailCustomFromEnabled = <var:string value="mailCustomFromEnabled" const:escapeHTML="NO"/>;
+      </script>
+
       <script type="text/ng-template" id="preferences.html">
 
         <md-sidenav id="left-sidenav" class="md-sidenav-left md-whiteframe-z1" md-component-id="left" md-is-locked-open="$mdMedia('gt-md')" layout="column">
diff --git a/UI/WebServerResources/js/PreferencesUI.js b/UI/WebServerResources/js/PreferencesUI.js
index 59dfdda7a..7138313ed 100644
--- a/UI/WebServerResources/js/PreferencesUI.js
+++ b/UI/WebServerResources/js/PreferencesUI.js
@@ -114,7 +114,8 @@
           templateUrl: 'editAccount?account=' + index,
           targetEvent: null,
           locals: { account: account,
-                    accountId: index}
+                    accountId: index,
+                    mailCustomFromEnabled: window.mailCustomFromEnabled}
         }).then(function() {
           $scope.preferences.defaults.AuxiliaryMailAccounts[index] = account;
         });
@@ -245,9 +246,15 @@
     };
   }
   
-  function AccountDialogCtrl($scope, $mdDialog, account, accountId) {
+  function AccountDialogCtrl($scope, $mdDialog, account, accountId, mailCustomFromEnabled) {
     $scope.account = account;
     $scope.accountId = accountId;
+    $scope.customFromIsReadonly = function() {
+      if (accountId > 0)
+        return false;
+
+      return !mailCustomFromEnabled;
+    };
     $scope.cancel = function() {
       $mdDialog.cancel();
     };