diff --git a/dashboard-ui/login.html b/dashboard-ui/login.html
index a7397f8b4b..2889ecf909 100644
--- a/dashboard-ui/login.html
+++ b/dashboard-ui/login.html
@@ -40,7 +40,10 @@
 
                 <p class="localhostMessage" style="text-align: center; display: none;">${PasswordLocalhostMessage}</p>
 
-                <p><a href="#" class="lnkManualLogin" onclick="LoginPage.showManualForm($.mobile.activePage, true);">${ButtonManualLogin}</a></p>
+                <p>
+                    <a href="forgotpassword.html" style="margin-right: 3em;">${ButtonForgotPassword}</a> 
+                    <a href="#" class="lnkManualLogin" onclick="LoginPage.showManualForm($.mobile.activePage, true);">${ButtonManualLogin}</a>
+                </p>
 
             </div>
 
diff --git a/dashboard-ui/scripts/connectlogin.js b/dashboard-ui/scripts/connectlogin.js
index 17665e02c2..b715605db8 100644
--- a/dashboard-ui/scripts/connectlogin.js
+++ b/dashboard-ui/scripts/connectlogin.js
@@ -2,7 +2,9 @@
 
     function onLoggedIn() {
 
-        window.location = 'selectserver.html';
+        // Need to switch from https to http
+
+        window.location = getWindowUrl().replace(/https/gi, 'http').replace(/connectlogin/gi, 'selectserver');
     }
 
     function login(page, username, password) {