diff --git a/apps/common/main/lib/component/InputField.js b/apps/common/main/lib/component/InputField.js
index 51c77c548..2ba3f7653 100644
--- a/apps/common/main/lib/component/InputField.js
+++ b/apps/common/main/lib/component/InputField.js
@@ -619,8 +619,10 @@ define([
                 if(this.options.showPwdOnClick) {
                     this._button.updateHint(this.textHintHidePwd);
                 }
-                else
-                    this._btnElm.on('mouseup', _.bind(this.passwordHide,this));
+                else {
+                    this._btnElm.on('mouseup', _.bind(this.passwordHide, this));
+                    this._btnElm.on('mouseout', _.bind(this.passwordHide, this));
+                }
             },
 
             passwordHide: function (e) {
@@ -636,8 +638,10 @@ define([
                 if(this.options.showPwdOnClick) {
                     this._button.updateHint(this.textHintShowPwd);
                 }
-                else
+                else {
                     this._btnElm.off('mouseup', this.passwordHide);
+                    this._btnElm.off('mouseout', this.passwordHide);
+                }
             },
             textHintShowPwd: 'Show password',
             textHintHidePwd: 'Hide password'
diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js
index 3864aaebb..0934a73d9 100644
--- a/apps/common/main/lib/view/OpenDialog.js
+++ b/apps/common/main/lib/view/OpenDialog.js
@@ -204,7 +204,7 @@ define([
                         el: $('#id-password-txt'),
                         type: 'password',
                         validateOnBlur: false,
-                        showPwdOnClick: false,
+                        showPwdOnClick: true,
                         validation  : function(value) {
                             return me.txtIncorrectPwd;
                         }
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 2371d9ada..cef0f0004 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -168,6 +168,8 @@
   "Common.UI.ExtendedColorDialog.textNew": "New",
   "Common.UI.ExtendedColorDialog.textRGBErr": "The entered value is incorrect.<br>Please enter a numeric value between 0 and 255.",
   "Common.UI.HSBColorPicker.textNoColor": "No Color",
+  "Common.UI.InputFieldBtnPassword.textHintHidePwd": "Hide password",
+  "Common.UI.InputFieldBtnPassword.textHintShowPwd": "Show password",
   "Common.UI.SearchDialog.textHighlight": "Highlight results",
   "Common.UI.SearchDialog.textMatchCase": "Case sensitive",
   "Common.UI.SearchDialog.textReplaceDef": "Enter the replacement text",
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index ff9853868..2939555b6 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -61,6 +61,8 @@
   "Common.UI.ExtendedColorDialog.textNew": "New",
   "Common.UI.ExtendedColorDialog.textRGBErr": "The entered value is incorrect.<br>Please enter a numeric value between 0 and 255.",
   "Common.UI.HSBColorPicker.textNoColor": "No Color",
+  "Common.UI.InputFieldBtnPassword.textHintHidePwd": "Hide password",
+  "Common.UI.InputFieldBtnPassword.textHintShowPwd": "Show password",
   "Common.UI.SearchDialog.textHighlight": "Highlight results",
   "Common.UI.SearchDialog.textMatchCase": "Case sensitive",
   "Common.UI.SearchDialog.textReplaceDef": "Enter the replacement text",
diff --git a/apps/spreadsheeteditor/main/app/view/ProtectDialog.js b/apps/spreadsheeteditor/main/app/view/ProtectDialog.js
index 0238e59b5..379502991 100644
--- a/apps/spreadsheeteditor/main/app/view/ProtectDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/ProtectDialog.js
@@ -131,7 +131,8 @@ define([
                 style       : 'width: 100%;',
                 maxLength: 255,
                 validateOnBlur: false,
-                repeatInput: this.repeatPwd
+                repeatInput: this.repeatPwd,
+                showPwdOnClick: true
             });
 
             if (this.type == 'sheet') {
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 92834a8e1..916f80f86 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -114,6 +114,8 @@
   "Common.UI.ExtendedColorDialog.textNew": "New",
   "Common.UI.ExtendedColorDialog.textRGBErr": "The entered value is incorrect.<br>Please enter a numeric value between 0 and 255.",
   "Common.UI.HSBColorPicker.textNoColor": "No Color",
+  "Common.UI.InputFieldBtnPassword.textHintHidePwd": "Hide password",
+  "Common.UI.InputFieldBtnPassword.textHintShowPwd": "Show password",
   "Common.UI.SearchDialog.textHighlight": "Highlight results",
   "Common.UI.SearchDialog.textMatchCase": "Case sensitive",
   "Common.UI.SearchDialog.textReplaceDef": "Enter the replacement text",