diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index 0930be948..8570a8c53 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -61,8 +61,8 @@
                   <md-input-container class="md-block">
                     <label><var:string label:value="Password"/></label>
                     <md-icon>vpn_key</md-icon>
-                    <input id="passwordField" type="password" ng-model="app.creds.password" ng-required="true"/>
-                    <md-icon id="password-visibility-icon" ng-click="app.changePasswordVisibility()">visibility</md-icon>
+                    <input id="passwordField" ng-model="app.creds.password" ng-required="true"/>
+                    <md-icon id="password-visibility-icon" ng-click="app.changePasswordVisibility('passwordField', 'password-visibility-icon')">visibility</md-icon>
                   </md-input-container>
                   
 
@@ -221,17 +221,20 @@
                     <md-input-container class="md-block" flex="flex" ng-if="!app.isInPasswordRecoveryMode()">
                         <label><var:string label:value="Current password"/>
                         </label>
-                        <input type="password" sg-no-dirty-check="true" ng-model="app.passwords.oldPassword"/>
+                        <input type="password" id="oldPassword" sg-no-dirty-check="true" ng-model="app.passwords.oldPassword"/>
+                        <md-icon id="oldpassword-visibility-icon" ng-click="app.changePasswordVisibility('oldPassword', 'oldpassword-visibility-icon')">visibility</md-icon>
                       </md-input-container>
                       <md-input-container class="md-block" flex="flex">
                         <label><var:string label:value="New password"/>
                         </label>
-                        <input type="password" sg-no-dirty-check="true" ng-model="app.passwords.newPassword"/>
+                        <input type="password" id="newPassword" sg-no-dirty-check="true" ng-model="app.passwords.newPassword"/>
+                        <md-icon id="newpassword-visibility-icon" ng-click="app.changePasswordVisibility('newPassword', 'newpassword-visibility-icon')">visibility</md-icon>
                       </md-input-container>
                       <md-input-container class="md-block" flex="flex">
                         <label><var:string label:value="Confirmation"/>
                         </label>
-                        <input type="password" name="newPasswordConfirmation" sg-no-dirty-check="true" ng-model="app.passwords.newPasswordConfirmation"/>
+                        <input type="password" id="newPasswordConfirmation" name="newPasswordConfirmation" sg-no-dirty-check="true" ng-model="app.passwords.newPasswordConfirmation"/>
+                        <md-icon id="newpasswordconfirmation-visibility-icon" ng-click="app.changePasswordVisibility('newPasswordConfirmation', 'newpasswordconfirmation-visibility-icon')">visibility</md-icon>
                         <div ng-messages="loginForm.newPasswordConfirmation.$error">
                           <div ng-message="newPasswordMismatch"><var:string label:value="Passwords don't match"/></div>
                         </div>
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 3d84c554a..f0f822f51 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -326,12 +326,14 @@
                   <md-input-container class="md-block" flex="flex">
                     <label><var:string label:value="Current password"/>
                     </label>
-                    <input type="password" sg-no-dirty-check="true" ng-model="app.passwords.oldPassword"/>
+                    <input type="password" id="oldPassword" sg-no-dirty-check="true" ng-model="app.passwords.oldPassword"/>
+                    <md-icon id="oldpassword-visibility-icon" ng-click="app.changePasswordVisibility('oldPassword', 'oldpassword-visibility-icon')">visibility</md-icon>
                   </md-input-container>
                   <md-input-container class="md-block" flex="flex">
                     <label><var:string label:value="New password"/>
                     </label>
-                    <input type="password" sg-no-dirty-check="true" ng-model="app.passwords.newPassword"/>
+                    <input type="password" id="newPassword" sg-no-dirty-check="true" ng-model="app.passwords.newPassword"/>
+                    <md-icon id="newpassword-visibility-icon" ng-click="app.changePasswordVisibility('newPassword', 'newpassword-visibility-icon')">visibility</md-icon>
                     <div class="sg-hint">
                       <ul class="sg-padded">
                         <var:foreach list="passwordPolicy" item="item">
@@ -343,7 +345,8 @@
                   <md-input-container class="md-block" flex="flex">
                     <label><var:string label:value="Confirmation"/>
                     </label>
-                    <input type="password" name="newPasswordConfirmation" sg-no-dirty-check="true" ng-model="app.passwords.newPasswordConfirmation"/>
+                    <input type="password" id="newPasswordConfirmation" name="newPasswordConfirmation" sg-no-dirty-check="true" ng-model="app.passwords.newPasswordConfirmation"/>
+                    <md-icon id="newpasswordconfirmation-visibility-icon" ng-click="app.changePasswordVisibility('newPasswordConfirmation', 'newpasswordconfirmation-visibility-icon')">visibility</md-icon>
                     <div ng-messages="preferencesForm.newPasswordConfirmation.$error">
                       <div ng-message="newPasswordMismatch"><var:string label:value="Passwords don't match"/></div>
                     </div>
diff --git a/UI/WebServerResources/js/Main/Main.app.js b/UI/WebServerResources/js/Main/Main.app.js
index 9f0fcf59d..eda808234 100644
--- a/UI/WebServerResources/js/Main/Main.app.js
+++ b/UI/WebServerResources/js/Main/Main.app.js
@@ -29,7 +29,8 @@
       this.verificationCodePattern = '\\d{6}';
 
       // Password policy - change expired password
-      this.passwords = { newPassword: null, newPasswordConfirmation: null, oldPassword: null, visible: false };
+      this.passwords = { newPassword: null, newPasswordConfirmation: null, oldPassword: null };
+      this.passwordsDisplayed = { password: false, oldPassword: false, newPassword: false, newPasswordConfirmation: false };
 
       // Password recovery
       this.passwordRecovery = {
@@ -330,17 +331,17 @@
       }
     };
 
-    this.changePasswordVisibility = function () {
-      this.passwords.visible = !this.passwords.visible;
-      var field = document.getElementById("passwordField");
-      if (this.passwords.visible) {
+    this.changePasswordVisibility = function (fieldId, iconId) {
+      this.passwordsDisplayed[fieldId] = !this.passwordsDisplayed[fieldId];
+      var field = document.getElementById(fieldId);
+      if (this.passwordsDisplayed[fieldId]) {
         field.type = "text";
-        document.getElementById("password-visibility-icon").innerHTML = 'visibility_off';
+        document.getElementById(iconId).innerHTML = 'visibility_off';
       } else {
         field.type = "password";
-        document.getElementById("password-visibility-icon").innerHTML = 'visibility';
+        document.getElementById(iconId).innerHTML = 'visibility';
       }
-    }
+    };
   }
 
   angular
diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js
index c92537bb1..ddbb03880 100644
--- a/UI/WebServerResources/js/Preferences/PreferencesController.js
+++ b/UI/WebServerResources/js/Preferences/PreferencesController.js
@@ -14,6 +14,7 @@
     this.$onInit = function() {
       this.preferences = Preferences;
       this.passwords = { newPassword: null, newPasswordConfirmation: null, oldPassword: null };
+      this.passwordsDisplayed = { oldPassword: false, newPassword: false, newPasswordConfirmation: false};
       this.timeZonesList = $window.timeZonesList;
       this.timeZonesSearchText = '';
       this.addressesSearchText = '';
@@ -745,6 +746,18 @@
         return null;
     };
 
+    this.changePasswordVisibility = function (fieldId, iconId) {
+      this.passwordsDisplayed[fieldId] = !this.passwordsDisplayed[fieldId];
+      var field = document.getElementById(fieldId);
+      if (this.passwordsDisplayed[fieldId]) {
+        field.type = "text";
+        document.getElementById(iconId).innerHTML = 'visibility_off';
+      } else {
+        field.type = "password";
+        document.getElementById(iconId).innerHTML = 'visibility';
+      }
+    };
+
   }
 
   angular