diff --git a/apps/common/main/lib/component/InputField.js b/apps/common/main/lib/component/InputField.js
index 9d3d138c37..18965f0316 100644
--- a/apps/common/main/lib/component/InputField.js
+++ b/apps/common/main/lib/component/InputField.js
@@ -568,7 +568,7 @@ define([
 
             initialize : function(options) {
                 options = options || {};
-                options.btnHint = options.btnHint || this.textHintShowPwd;
+                options.btnHint = options.btnHint || (options.showPwdOnClick ? this.textHintShowPwd : this.textHintHold);
                 options.iconCls = options.showCls || this.options.showCls;
 
                 Common.UI.InputFieldBtn.prototype.initialize.call(this, options);
@@ -656,7 +656,8 @@ define([
                 }
             },
             textHintShowPwd: 'Show password',
-            textHintHidePwd: 'Hide password'
+            textHintHidePwd: 'Hide password',
+            textHintHold: 'Press and hold to show password'
         }
     })(), Common.UI.InputFieldBtnPassword || {}));
 
diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js
index bbbae218a9..a9379de77b 100644
--- a/apps/common/main/lib/view/OpenDialog.js
+++ b/apps/common/main/lib/view/OpenDialog.js
@@ -208,7 +208,7 @@ define([
                         hideCls: (this.options.iconType==='svg' ? 'svg-icon hide-password' : 'toolbar__icon btn-hide-password'),
                         maxLength: this.options.maxPasswordLength,
                         validateOnBlur: false,
-                        showPwdOnClick: true,
+                        showPwdOnClick: false,
                         validation  : function(value) {
                             return me.txtIncorrectPwd;
                         }
diff --git a/apps/common/main/lib/view/PasswordDialog.js b/apps/common/main/lib/view/PasswordDialog.js
index 2e5a53b0ff..e8091f9fb1 100644
--- a/apps/common/main/lib/view/PasswordDialog.js
+++ b/apps/common/main/lib/view/PasswordDialog.js
@@ -111,7 +111,8 @@ define([
                         style       : 'width: 100%;',
                         maxLength: 255,
                         validateOnBlur: false,
-                        repeatInput: this.repeatPwd
+                        repeatInput: this.repeatPwd,
+                        showPwdOnClick: false
                     });
             }
         },
diff --git a/apps/documenteditor/main/app/view/ProtectDialog.js b/apps/documenteditor/main/app/view/ProtectDialog.js
index 1d15267880..394747ab8b 100644
--- a/apps/documenteditor/main/app/view/ProtectDialog.js
+++ b/apps/documenteditor/main/app/view/ProtectDialog.js
@@ -113,7 +113,7 @@ define([
                 maxLength: 15,
                 validateOnBlur: false,
                 repeatInput: this.repeatPwd,
-                showPwdOnClick: true,
+                showPwdOnClick: false,
                 validation  : function(value) {
                     return (value.length>15) ? me.txtLimit : true;
                 }
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 31ef0bc719..0237d7fe7f 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -343,6 +343,7 @@
   "Common.UI.InputFieldBtnCalendar.textDate": "Select date",
   "Common.UI.InputFieldBtnPassword.textHintHidePwd": "Hide password",
   "Common.UI.InputFieldBtnPassword.textHintShowPwd": "Show password",
+  "Common.UI.InputFieldBtnPassword.textHintHold": "Press and hold to show password",
   "Common.UI.SearchBar.textFind": "Find",
   "Common.UI.SearchBar.tipCloseSearch": "Close search",
   "Common.UI.SearchBar.tipNextResult": "Next result",
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 3aa66e0658..03fc3c822e 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -434,6 +434,7 @@
   "Common.UI.HSBColorPicker.textNoColor": "No Color",
   "Common.UI.InputFieldBtnPassword.textHintHidePwd": "Hide password",
   "Common.UI.InputFieldBtnPassword.textHintShowPwd": "Show password",
+  "Common.UI.InputFieldBtnPassword.textHintHold": "Press and hold to show password",
   "Common.UI.SearchBar.textFind": "Find",
   "Common.UI.SearchBar.tipCloseSearch": "Close search",
   "Common.UI.SearchBar.tipNextResult": "Next result",
diff --git a/apps/spreadsheeteditor/main/app/view/ProtectDialog.js b/apps/spreadsheeteditor/main/app/view/ProtectDialog.js
index 075318f998..65933bc602 100644
--- a/apps/spreadsheeteditor/main/app/view/ProtectDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/ProtectDialog.js
@@ -155,7 +155,7 @@ define([
                 maxLength: 255,
                 validateOnBlur: false,
                 repeatInput: this.repeatPwd,
-                showPwdOnClick: true
+                showPwdOnClick: false
             });
 
             if (this.type == 'sheet') {
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index d738cd6c4e..90a30927e5 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -284,6 +284,7 @@
   "Common.UI.HSBColorPicker.textNoColor": "No Color",
   "Common.UI.InputFieldBtnPassword.textHintHidePwd": "Hide password",
   "Common.UI.InputFieldBtnPassword.textHintShowPwd": "Show password",
+  "Common.UI.InputFieldBtnPassword.textHintHold": "Press and hold to show password",
   "Common.UI.SearchBar.textFind": "Find",
   "Common.UI.SearchBar.tipCloseSearch": "Close search",
   "Common.UI.SearchBar.tipNextResult": "Next result",