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 2fe8a38..8537d1b 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
@@ -27,6 +27,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -41,12 +42,12 @@ import androidx.compose.ui.unit.sp
 
 @Composable
 fun homeScreen(paddingValues: PaddingValues) {
-    var currentScreen by remember { mutableStateOf(0) }
-    var nextScreen by remember { mutableStateOf(1) }
-    var serverURL = ""
-    var username by remember { mutableStateOf("") }
-    var password by remember { mutableStateOf("") }
-    var apiKey by remember { mutableStateOf("") }
+    var currentScreen by rememberSaveable { mutableStateOf(0) }
+    var nextScreen by rememberSaveable { mutableStateOf(1) }
+    var serverURL by rememberSaveable { mutableStateOf("") }
+    var username by rememberSaveable { mutableStateOf("") }
+    var password by rememberSaveable { mutableStateOf("") }
+    var apiKey by rememberSaveable { mutableStateOf("") }
 
     Column (
         modifier = Modifier