diff --git a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
index cab7c79942..fd68aa41ce 100644
--- a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
+++ b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
@@ -81,6 +81,7 @@ Item {
                     color: "red";
                     font.family: signUpBody.fontFamily
                     font.pixelSize: 18
+                    font.bold: completeProfileBody.fontBold
                     verticalAlignment: Text.AlignVCenter
                     horizontalAlignment: Text.AlignHCenter
                     text: completeProfileBody.errorString
diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index e7b900fec9..58ad807897 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -124,6 +124,7 @@ Item {
                     color: "red";
                     font.family: linkAccountBody.fontFamily
                     font.pixelSize: linkAccountBody.textFieldFontSize
+                    font.bold: linkAccountBody.fontBold
                     verticalAlignment: Text.AlignVCenter
                     horizontalAlignment: Text.AlignHCenter
                     text: ""
diff --git a/interface/resources/qml/LoginDialog/SignUpBody.qml b/interface/resources/qml/LoginDialog/SignUpBody.qml
index 162ac6d344..ffe1b2cb66 100644
--- a/interface/resources/qml/LoginDialog/SignUpBody.qml
+++ b/interface/resources/qml/LoginDialog/SignUpBody.qml
@@ -75,7 +75,9 @@ Item {
         emailField.anchors.top = usernameField.bottom;
         emailField.anchors.topMargin = 1.5 * hifi.dimensions.contentSpacing.y;
         passwordField.text = "";
-        usernameField.focus = true;
+        usernameField.forceActiveFocus();
+        root.text = "";
+        root.isPassword = false;
         loginContainer.visible = true;
     }
 
@@ -117,6 +119,7 @@ Item {
                     color: "red";
                     font.family: signUpBody.fontFamily
                     font.pixelSize: 18
+                    font.bold: signUpBody.fontBold
                     verticalAlignment: Text.AlignVCenter
                     horizontalAlignment: Text.AlignHCenter
                     text: ""
@@ -135,7 +138,6 @@ Item {
                     top: parent.top
                     topMargin: loginErrorMessage.height
                 }
-                focus: true
                 Keys.onPressed: {
                     if (!usernameField.visible) {
                         return;
diff --git a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
index db4950ae02..7552e94862 100644
--- a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
+++ b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
@@ -102,6 +102,7 @@ Item {
                 leftMargin: (parent.width - width) / 2
                 topMargin: hifi.dimensions.contentSpacing.y
             }
+            focus: true
             font.family: "Fira Sans"
             font.pixelSize: usernameCollisionBody.textFieldFontSize
             styleRenderType: Text.QtRendering
@@ -112,7 +113,9 @@ Item {
 
             onFocusChanged: {
                 root.text = "";
-                root.isPassword = !focus;
+                if (focus) {
+                    root.isPassword = false;
+                }
             }
 
             Keys.onPressed: {
@@ -128,6 +131,10 @@ Item {
                         break;
                 }
             }
+            Component.onCompleted: {
+                root.text = "";
+                root.isPassword = false;
+            }
         }
 
         // Override ScrollingWindow's keyboard that would be at very bottom of dialog.