diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreen.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreen.kt
index 932122b91..d22c48b0c 100644
--- a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreen.kt
+++ b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreen.kt
@@ -40,7 +40,7 @@ fun LoginScreen(
     onFinish: (Account?) -> Unit
 ) {
     val model: LoginScreenModel = hiltViewModel { factory: LoginScreenModel.Factory ->
-        factory.create(skipLoginTypePage, initialLoginInfo, initialLoginType)
+        factory.create(initialLoginType, skipLoginTypePage, initialLoginInfo)
     }
 
     // handle back/up navigation
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreenModel.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreenModel.kt
index 7b5928917..98da99b4e 100644
--- a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreenModel.kt
+++ b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreenModel.kt
@@ -33,9 +33,9 @@ import kotlinx.coroutines.withContext
 
 @HiltViewModel(assistedFactory = LoginScreenModel.Factory::class)
 class LoginScreenModel @AssistedInject constructor(
+    @Assisted val initialLoginType: LoginType,
     @Assisted val skipLoginTypePage: Boolean,
     @Assisted val initialLoginInfo: LoginInfo,
-    @Assisted val initialLoginType: LoginType,
     val context: Application,
     val loginTypesProvider: LoginTypesProvider,
     private val accountRepository: AccountRepository,
@@ -45,9 +45,9 @@ class LoginScreenModel @AssistedInject constructor(
     @AssistedFactory
     interface Factory {
         fun create(
+            initialLoginType: LoginType,
             skipLoginTypePage: Boolean,
-            initialLoginInfo: LoginInfo,
-            initialLoginType: LoginType
+            initialLoginInfo: LoginInfo
         ): LoginScreenModel
     }