diff --git a/dashboard-ui/forgotpassword.html b/dashboard-ui/forgotpassword.html
index 1ce4bc46f6..b1f6c66e9d 100644
--- a/dashboard-ui/forgotpassword.html
+++ b/dashboard-ui/forgotpassword.html
@@ -14,24 +14,19 @@
                     <h1>${HeaderForgotPassword}</h1>
 
                     <div>
-                        <label for="txtName" style="text-align: left;">${LabelUser}</label>
-                        <input type="text" id="txtName" />
+                        <paper-input type="text" id="txtName" label="${LabelUser}" autocomplete="off"></paper-input>
                         <div class="fieldDescription">${LabelForgotPasswordUsernameHelp}</div>
                     </div>
 
                     <br />
 
-                    <p>
-                        <button type="submit" data-icon="check">
-                            ${ButtonSubmit}
+                    <div>
+                        <button type="submit" data-role="none" class="clearButton">
+                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSubmit}</span></paper-button>
                         </button>
-                    </p>
 
-                    <p>
-                        <a data-role="button" data-icon="delete" href="login.html">
-                            ${ButtonCancel}
-                        </a>
-                    </p>
+                        <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                    </div>
                 </div>
             </form>
 
diff --git a/dashboard-ui/forgotpasswordpin.html b/dashboard-ui/forgotpasswordpin.html
index c4ce4017de..5bd2b0b63e 100644
--- a/dashboard-ui/forgotpasswordpin.html
+++ b/dashboard-ui/forgotpasswordpin.html
@@ -13,22 +13,19 @@
                 <div style="text-align: left;">
                     <h2>${HeaderPasswordReset}</h2>
 
-                    <label for="txtPin" style="text-align: left;">${LabelPasswordRecoveryPinCode}</label>
-                    <input type="text" id="txtPin" required="required" />
+                    <div>
+                        <paper-input type="text" id="txtPin" label="${LabelPasswordRecoveryPinCode}" autocomplete="off" required="required"></paper-input>
+                    </div>
 
                     <br />
 
-                    <p>
-                        <button type="submit" data-icon="check">
-                            ${ButtonSubmit}
+                    <div>
+                        <button type="submit" data-role="none" class="clearButton">
+                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSubmit}</span></paper-button>
                         </button>
-                    </p>
 
-                    <p>
-                        <a data-role="button" data-icon="delete" href="login.html">
-                            ${ButtonCancel}
-                        </a>
-                    </p>
+                        <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                    </div>
                 </div>
             </form>
 
diff --git a/dashboard-ui/scripts/forgotpasswordpin.js b/dashboard-ui/scripts/forgotpasswordpin.js
index 5914be6f37..81790b8d49 100644
--- a/dashboard-ui/scripts/forgotpasswordpin.js
+++ b/dashboard-ui/scripts/forgotpasswordpin.js
@@ -51,8 +51,11 @@
         return false;
     }
 
-    $(document).on('pageinit', '#forgotPasswordPinPage', function () {
-        $('.forgotPasswordPinForm').off('submit', onSubmit).on('submit', onSubmit);
+    $(document).on('pageinit', '.forgotPasswordPinPage', function () {
+
+        var page = this;
+
+        $('form', page).off('submit', onSubmit).on('submit', onSubmit);
     });
 
 })(window);
\ No newline at end of file