diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index 1fc1b3d1e2..3f2303d9f7 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -18,6 +18,7 @@ import stylesUit 1.0 as HifiStylesUit
 import TabletScriptingInterface 1.0
 
 Item {
+    z: -2
     id: linkAccountBody
     clip: true
     focus: true
@@ -82,6 +83,7 @@ Item {
     }
 
     Item {
+        z: 10
         id: mainContainer
         width: root.width
         height: root.height
@@ -442,6 +444,16 @@ Item {
             }
         }
     }
+    MouseArea {
+        anchors.fill: parent
+        onClicked: {
+            print("clicked");
+            if (!emailField.focus && !passwordField.focus) {
+                print("forcing active focus");
+                emailField.forceActiveFocus();
+            }
+        }
+    }
 
     Component.onCompleted: {
         //but rise Tablet's one instead for Tablet interface
diff --git a/interface/resources/qml/LoginDialog/SignUpBody.qml b/interface/resources/qml/LoginDialog/SignUpBody.qml
index 5d87b7e143..94783904de 100644
--- a/interface/resources/qml/LoginDialog/SignUpBody.qml
+++ b/interface/resources/qml/LoginDialog/SignUpBody.qml
@@ -393,6 +393,16 @@ Item {
         }
     }
 
+    MouseArea {
+        anchors.fill: parent
+        acceptedButtons: Qt.LeftButton
+        onClicked: {
+            if (!usernameField.focus && !emailField.focus && !passwordField.focus) {
+                usernameField.focus = true;
+            }
+        }
+    }
+
     Component.onCompleted: {
         //but rise Tablet's one instead for Tablet interface
         root.keyboardEnabled = HMD.active;
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 2ed5a4814e..87e552dd92 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5340,6 +5340,7 @@ void Application::pauseUntilLoginDetermined() {
     }
 
     getMyAvatar()->setEnableMeshVisible(false);
+    _controllerScriptingInterface->disableMapping("Standard to Action");
 
     const auto& nodeList = DependencyManager::get<NodeList>();
     // save interstitial mode setting until resuming.
@@ -5381,6 +5382,7 @@ void Application::resumeAfterLoginDialogActionTaken() {
     updateSystemTabletMode();
 
     getMyAvatar()->setEnableMeshVisible(true);
+    _controllerScriptingInterface->enableMapping("Standard to Action");
 
     const auto& nodeList = DependencyManager::get<NodeList>();
     nodeList->getDomainHandler().setInterstitialModeEnabled(_interstitialModeEnabled);
@@ -8727,7 +8729,7 @@ void Application::createLoginDialogOverlay() {
         { "dpi", overlayDpi },
         { "visible", true }
     };
-
+    auto& overlays = getOverlays();
     _loginDialogOverlayID = getOverlays().addOverlay("web3d", overlayProperties);
     auto keyboard = DependencyManager::get<Keyboard>().data();
     if (!keyboard->getAnchorID().isNull() && !_loginDialogOverlayID.isNull()) {
@@ -8736,7 +8738,7 @@ void Application::createLoginDialogOverlay() {
             { "localPosition", vec3toVariant(glm::vec3(-0.3f, -0.3f, 0.2f)) },
             { "localOrientation", quatToVariant(glm::quat(0.0f, 0.0, 1.0f, 0.25f)) },
         };
-        getOverlays().editOverlay(keyboard->getAnchorID(), properties);
+        overlays.editOverlay(keyboard->getAnchorID(), properties);
         keyboard->setResetKeyboardPositionOnRaise(false);
     }
     getApplicationCompositor().getReticleInterface()->setAllowMouseCapture(false);
diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp
index fd5c118f76..3f06b43a9e 100644
--- a/interface/src/ui/overlays/Web3DOverlay.cpp
+++ b/interface/src/ui/overlays/Web3DOverlay.cpp
@@ -223,6 +223,7 @@ bool Web3DOverlay::isWebContent() const {
 
 void Web3DOverlay::setupQmlSurface(bool isTablet) {
     _webSurface->getSurfaceContext()->setContextProperty("Users", DependencyManager::get<UsersScriptingInterface>().data());
+    _webSurface->getSurfaceContext()->setContextProperty("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
     _webSurface->getSurfaceContext()->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data());
     _webSurface->getSurfaceContext()->setContextProperty("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
     _webSurface->getSurfaceContext()->setContextProperty("Preferences", DependencyManager::get<Preferences>().data());
@@ -242,7 +243,6 @@ void Web3DOverlay::setupQmlSurface(bool isTablet) {
         _webSurface->getSurfaceContext()->setContextProperty("offscreenFlags", flags);
         _webSurface->getSurfaceContext()->setContextProperty("AddressManager", DependencyManager::get<AddressManager>().data());
 
-        _webSurface->getSurfaceContext()->setContextProperty("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
         _webSurface->getSurfaceContext()->setContextProperty("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
         _webSurface->getSurfaceContext()->setContextProperty("AccountServices", AccountServicesScriptingInterface::getInstance());