diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js
index c5363d08b..a2037b3da 100644
--- a/UI/WebServerResources/js/Preferences/PreferencesController.js
+++ b/UI/WebServerResources/js/Preferences/PreferencesController.js
@@ -126,7 +126,7 @@
         locals: {
           defaults: this.preferences.defaults,
           account: account,
-          accountId: (this.preferences.defaults.AuxiliaryMailAccounts.length-1),
+          accountId: index,
           mailCustomFromEnabled: $window.mailCustomFromEnabled
         }
       }).then(function() {