diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt
index ceb457e61..19fd4f22f 100644
--- a/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt
@@ -97,7 +97,7 @@ class MainErosController : JavaFXWindowController() {
             activity = ErosMainActivities.PlAY
         }
         settingsIconFX.setOnMouseClicked {
-            // activity = ErosMainActivities.SETTINGS
+            // ToDo: activity = ErosMainActivities.SETTINGS
         }
         helpIconFX.setOnMouseClicked {
             // ToDo: activity = ErosMainActivities.HELP
diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/account/add/MojangAddController.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/account/add/MojangAddController.kt
index 63386427e..0401bec9a 100644
--- a/src/main/java/de/bixilon/minosoft/gui/eros/main/account/add/MojangAddController.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/account/add/MojangAddController.kt
@@ -29,6 +29,8 @@ import javafx.fxml.FXML
 import javafx.scene.control.Button
 import javafx.scene.control.PasswordField
 import javafx.scene.control.TextField
+import javafx.scene.input.KeyCode
+import javafx.scene.input.KeyEvent
 import javafx.scene.text.TextFlow
 import javafx.stage.Modality
 
@@ -79,6 +81,11 @@ class MojangAddController(
         passwordFX.textProperty().addListener { _, _, _ ->
             validate()
         }
+        stage.scene.root.addEventFilter(KeyEvent.KEY_PRESSED) {
+            if (it.code == KeyCode.ENTER) {
+                login()
+            }
+        }
     }
 
     private fun validate() {
@@ -95,6 +102,9 @@ class MojangAddController(
 
     @FXML
     fun login() {
+        if (loginButtonFX.isDisable) {
+            return
+        }
         loginButtonFX.isDisable = true
         errorFX.isVisible = false
         DefaultThreadPool += {
diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/account/add/OfflineAddController.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/account/add/OfflineAddController.kt
index d98b494ef..0e9cb6b34 100644
--- a/src/main/java/de/bixilon/minosoft/gui/eros/main/account/add/OfflineAddController.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/account/add/OfflineAddController.kt
@@ -27,6 +27,8 @@ import javafx.application.Platform
 import javafx.fxml.FXML
 import javafx.scene.control.Button
 import javafx.scene.control.TextField
+import javafx.scene.input.KeyCode
+import javafx.scene.input.KeyEvent
 import javafx.scene.text.TextFlow
 import javafx.stage.Modality
 
@@ -64,10 +66,18 @@ class OfflineAddController(
         usernameFX.textProperty().addListener { _, _, new ->
             addButtonFX.isDisable = !ProtocolDefinition.MINECRAFT_NAME_VALIDATOR.matcher(new).matches()
         }
+        stage.scene.root.addEventFilter(KeyEvent.KEY_PRESSED) {
+            if (it.code == KeyCode.ENTER) {
+                add()
+            }
+        }
     }
 
     @FXML
     fun add() {
+        if (addButtonFX.isDisable) {
+            return
+        }
         val account = OfflineAccount(usernameFX.text)
         Minosoft.config.config.account.entries[account.id] = account
         Minosoft.config.saveToFile()