diff --git a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
index 10823b0fc8..282295fe0b 100644
--- a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
+++ b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
@@ -461,7 +461,7 @@ Item {
             console.log("Create Failed: " + error);
             if (completeProfileBody.withOculus) {
                 loginErrorMessage.visible = true;
-                loginErrorMessage.text = "Make sure email and username fields are filled out.";
+                loginErrorMessage.text = error;
 
                 if (loginErrorMessageTextMetrics.width > root.bannerWidth && root.isTablet) {
                     loginErrorMessage.wrapMode = Text.WordWrap;
diff --git a/interface/resources/qml/dialogs/TabletLoginDialog.qml b/interface/resources/qml/dialogs/TabletLoginDialog.qml
index 826d895b5f..01a597fb9e 100644
--- a/interface/resources/qml/dialogs/TabletLoginDialog.qml
+++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml
@@ -29,7 +29,7 @@ FocusScope {
 
     property var tabletProxy: Tablet.getTablet("com.highfidelity.interface.tablet.system");
 
-    property bool isHMD: false
+    property bool isHMD: HMD.active
     property bool gotoPreviousApp: false;
 
     property bool keyboardEnabled: false
@@ -78,7 +78,7 @@ FocusScope {
         interval: 200
 
         onTriggered: {
-            if (MenuInterface.isOptionChecked("Use 3D Keyboard") && HMD.active) {
+            if (MenuInterface.isOptionChecked("Use 3D Keyboard") && root.isHMD) {
                 KeyboardScriptingInterface.raised = true;
             }
         }
@@ -170,7 +170,7 @@ FocusScope {
 
     Component.onDestruction: {
         loginKeyboard.raised = false;
-        if (HMD.active) {
+        if (root.isHMD) {
             KeyboardScriptingInterface.raised = false;
         }
     }