diff --git a/app/src/main/java/com/etesync/syncadapter/ui/etebase/SignupFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/etebase/SignupFragment.kt
index e65260f6..9847533e 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/etebase/SignupFragment.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/etebase/SignupFragment.kt
@@ -73,7 +73,7 @@ class SignupFragment(private val initialUsername: String?, private val initialPa
         val login = v.findViewById<Button>(R.id.login)
         login.setOnClickListener {
             parentFragmentManager.commit {
-                replace(android.R.id.content, LoginCredentialsFragment(editUserName.editText?.text.toString(), editPassword.editText?.text.toString()))
+                replace(android.R.id.content, LoginCredentialsFragment.newInstance(editUserName.editText?.text.toString(), editPassword.editText?.text.toString()))
             }
         }
 
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginActivity.kt
index 27ddbd50..8dd3bec0 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginActivity.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginActivity.kt
@@ -30,7 +30,7 @@ class LoginActivity : BaseActivity() {
         if (savedInstanceState == null)
         // first call, add fragment
             supportFragmentManager.beginTransaction()
-                    .replace(android.R.id.content, LoginCredentialsFragment(null, null))
+                    .replace(android.R.id.content, LoginCredentialsFragment())
                     .commit()
 
     }
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.kt
index 09a35d77..b51c51f4 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.kt
@@ -29,13 +29,16 @@ import net.cachapa.expandablelayout.ExpandableLayout
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import java.net.URI
 
-class LoginCredentialsFragment(private val initialUsername: String?, private val initialPassword: String?) : Fragment() {
+class LoginCredentialsFragment : Fragment() {
     internal lateinit var editUserName: EditText
     internal lateinit var editUrlPassword: TextInputLayout
 
     internal lateinit var showAdvanced: CheckedTextView
     internal lateinit var customServer: EditText
 
+    internal var initialUsername: String? = null
+    internal var initialPassword: String? = null
+
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val v = inflater.inflate(R.layout.login_credentials_fragment, container, false)
@@ -119,4 +122,13 @@ class LoginCredentialsFragment(private val initialUsername: String?, private val
 
         return if (valid) LoginCredentials(uri, userName, password) else null
     }
+
+    companion object {
+        fun newInstance(initialUsername: String?, initialPassword: String?): LoginCredentialsFragment {
+            val ret = LoginCredentialsFragment()
+            ret.initialUsername = initialUsername
+            ret.initialPassword = initialPassword
+            return ret
+        }
+    }
 }