2 files changed, 6 insertions, 4 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputController.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputController.kt
index 0890ba9ab8..47beece9ef 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputController.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputController.kt
@@ -106,11 +106,8 @@ class AccountInputController(val parentView: View, context: Context) {
                 )
 
                 setOnItemClickListener { _, _, idx, _ ->
-                    val accountNumber = history[idx]
-
-                    input.setText(accountNumber)
+                    newInput.loginWith(history[idx])
                     accountHistoryList.visibility = View.GONE
-                    onLogin?.invoke(accountNumber)
                 }
             }
 
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt
index 64bad94b5d..72bfd39d6c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt
@@ -81,6 +81,11 @@ class AccountInput : LinearLayout {
         setButtonEnabled(false)
     }
 
+    fun loginWith(accountNumber: String) {
+        input.text = accountNumber
+        onLogin?.invoke(accountNumber)
+    }
+
     private fun initialState() {
         input.apply {
             setTextColor(enabledTextColor)