1 files changed, 6 insertions, 1 deletions

diff --git a/framework/qml/LoginAccount.qml b/framework/qml/LoginAccount.qml
index f1289dc4..65f162a8 100644
--- a/framework/qml/LoginAccount.qml
+++ b/framework/qml/LoginAccount.qml
@@ -97,7 +97,11 @@ Item {
                 }
             }
         }
-        Keys.onReturnPressed: login()
+        Keys.onReturnPressed: {
+            if (loader.item.valid) {
+                login()
+            }
+        }
 
         Item {
             id: footer
@@ -112,6 +116,7 @@ Item {
                 anchors.right: parent.right
                 text: qsTr("Login")
                 onClicked: login()
+                enabled: loader.item.valid
             }
         }
     }