diff --git a/app/src/main/java/de/lelehier/keeper/MainActivity.kt b/app/src/main/java/de/lelehier/keeper/MainActivity.kt
index e80dfc5..6dcc779 100644
--- a/app/src/main/java/de/lelehier/keeper/MainActivity.kt
+++ b/app/src/main/java/de/lelehier/keeper/MainActivity.kt
@@ -10,7 +10,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import de.lelehier.keeper.ui.theme.KeeperTheme
-import de.lelehier.keeper.screens.LoginScreen
+import de.lelehier.keeper.screens.HomeScreen
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -21,7 +21,7 @@ class MainActivity : ComponentActivity() {
                 var currentScreen by remember { mutableStateOf(0) }
 
                 Scaffold() { paddingValues ->
-                LoginScreen(paddingValues)
+                HomeScreen(paddingValues)
                 }
             }
         }
diff --git a/app/src/main/java/de/lelehier/keeper/screens/home_screen.kt b/app/src/main/java/de/lelehier/keeper/screens/home_screen.kt
index cd27f0d..27e68e6 100644
--- a/app/src/main/java/de/lelehier/keeper/screens/home_screen.kt
+++ b/app/src/main/java/de/lelehier/keeper/screens/home_screen.kt
@@ -53,7 +53,7 @@ import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.ui.tooling.preview.Preview
 
 @Composable
-fun LoginScreen(paddingValues: PaddingValues) {
+fun HomeScreen(paddingValues: PaddingValues) {
     var currentScreen by rememberSaveable { mutableStateOf("serverDialog") }
     var serverURL by rememberSaveable { mutableStateOf("") }
     var username by rememberSaveable { mutableStateOf("") }
@@ -88,8 +88,7 @@ fun LoginScreen(paddingValues: PaddingValues) {
 
         AnimatedVisibility(currentScreen == "passwordDialog" || currentScreen == "apiDialog") {
             Row(
-                modifier = Modifier
-                    .padding(bottom = 12.dp)
+                modifier = Modifier.padding(bottom = 12.dp)
                     .fillMaxWidth(),
                 horizontalArrangement = Arrangement.SpaceBetween
             ) {
@@ -125,37 +124,25 @@ fun LoginScreen(paddingValues: PaddingValues) {
                 }
             }
         }
-        AnimatedVisibility(currentScreen != "loadingDialog") {
-            Button(
-                onClick = {
-                    when (currentScreen) {
-                        "serverDialog" -> currentScreen = "passwordDialog"
-                        "passwordDialog" -> currentScreen = "loadingDialog"
-                        "apiDialog" -> currentScreen = "loadingDialog"
-                        "loadingDialog" -> currentScreen = "loadingDialog"
-                    }
-                },
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(96.dp),
-                enabled = when (currentScreen) {
-                    "serverDialog" -> isValidUrl(serverURL)
-                    "passwordDialog" -> username.isNotEmpty() && password.isNotEmpty()
-                    "apiDialog" -> apiKey.isNotEmpty()
-                    else -> false
-                },
-            ) {
-                Row() {
-                    Text(
-                        text = when (currentScreen) {
-                            "serverDialog" -> "Next"
-                            "passwordDialog" -> "Login"
-                            "apiDialog" -> "Login"
-                            else -> ""
-
-                        }
-                    )
-                }
+        Button(
+            onClick = {when(currentScreen) {
+                "serverDialog" -> currentScreen = "passwordDialog"
+                "passwordDialog" -> currentScreen = "loadingDialog"
+                "apiDialog" -> currentScreen = "loadingDialog"
+                "loadingDialog" -> currentScreen = "loadingDialog"
+            }},
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(96.dp),
+            enabled = when(currentScreen) {
+                "serverDialog" -> isValidUrl(serverURL)
+                "passwordDialog" -> username.isNotEmpty() && password.isNotEmpty()
+                "apiDialog" -> apiKey.isNotEmpty()
+                else -> false
+            },
+        ) {
+            Row() {
+                Text(text = "Next")
             }
         }
     }