diff --git a/dashboard-ui/pin.html b/dashboard-ui/pin.html
index 82e21b623d..18c1b7170d 100644
--- a/dashboard-ui/pin.html
+++ b/dashboard-ui/pin.html
@@ -11,8 +11,7 @@
             <form style="margin: auto;">
                 <h1>${HeaderEnterPinCode}</h1>
 
-                <br />
-                <p>${ButtonEnterPinCodeHelp}</p>
+                <p style="margin-top:2em;">${ButtonEnterPinCodeHelp}</p>
 
                 <paper-input type="number" id="txtPin" pattern="[0-9]*" required="required" min="0" max="999999" step="1" label="${LabelPinCode}"></paper-input>
 
@@ -21,7 +20,7 @@
                     <paper-button raised class="accent block"><iron-icon icon="check"></iron-icon><span>${ButtonSignIn}</span></paper-button>
                 </button>
 
-                <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                <paper-button raised class="cancel block btnCancel"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
                 <br />
                 <br />
             </form>
diff --git a/dashboard-ui/scripts/pin.js b/dashboard-ui/scripts/pin.js
index 436a93ccbc..0ec495654e 100644
--- a/dashboard-ui/scripts/pin.js
+++ b/dashboard-ui/scripts/pin.js
@@ -47,6 +47,9 @@
 
         page.querySelector('form').addEventListener('submit', onSubmit);
 
+        page.querySelector('.btnCancel').addEventListener('click', function () {
+            Dashboard.navigate('mypreferencesmenu.html?userId=' + ApiClient.getCurrentUserId());
+        });
     });
 
     pageIdOn('pageshow', 'pinEntryPage', function () {