diff --git a/dashboard-ui/myprofile.html b/dashboard-ui/myprofile.html
index feec69c68..f93aa1d87 100644
--- a/dashboard-ui/myprofile.html
+++ b/dashboard-ui/myprofile.html
@@ -88,7 +88,7 @@
                         <div>${EasyPasswordHelp}</div>
                         <br />
                         <div>
-                            <paper-input type="password" id="txtEasyPassword" label="${LabelEasyPinCode}" autocomplete="off"></paper-input>
+                            <paper-input type="number" id="txtEasyPassword" label="${LabelEasyPinCode}" autocomplete="off" pattern="[0-9]*" step="1" maxlength="5"></paper-input>
                         </div>
                         <br />
                         <div>
diff --git a/dashboard-ui/userpassword.html b/dashboard-ui/userpassword.html
index a317d94ea..6bd11a4b9 100644
--- a/dashboard-ui/userpassword.html
+++ b/dashboard-ui/userpassword.html
@@ -60,7 +60,7 @@
                                 <div>${EasyPasswordHelp}</div>
                                 <br />
                                 <div>
-                                    <paper-input type="password" id="txtEasyPassword" label="${LabelEasyPinCode}" autocomplete="off"></paper-input>
+                                    <paper-input type="number" id="txtEasyPassword" label="${LabelEasyPinCode}" autocomplete="off" pattern="[0-9]*" step="1" maxLength="5"></paper-input>
                                 </div>
                                 <br />
                                 <div>