diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt
index 7a665197b3..8e7a3dddab 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt
@@ -14,7 +14,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
-import android.widget.TextView
 import androidx.annotation.ColorRes
 import androidx.annotation.StringRes
 import androidx.annotation.VisibleForTesting
@@ -274,11 +273,11 @@ class LoginActivity : AccountAuthenticatorActivity() {
         }
     }
 
-    private fun onEditorAction(textView: TextView, actionId: Int, keyEvent: KeyEvent?) =
-        if (binding!!.loginButton.isEnabled && isTriggerAction(actionId, keyEvent)) {
-            performLogin()
-            true
-        } else false
+//    private fun onEditorAction(textView: TextView, actionId: Int, keyEvent: KeyEvent?) =
+//        if (binding!!.loginButton.isEnabled && isTriggerAction(actionId, keyEvent)) {
+//            performLogin()
+//            true
+//        } else false
 
     private fun isTriggerAction(actionId: Int, keyEvent: KeyEvent?) =
         actionId == EditorInfo.IME_ACTION_NEXT || actionId == EditorInfo.IME_ACTION_DONE || keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER
@@ -462,8 +461,8 @@ class LoginActivity : AccountAuthenticatorActivity() {
 
     private fun onTextChanged(text: String) {
         val enabled =
-            binding!!.loginUsername.text!!.length != 0 && binding!!.loginPassword.text!!.length != 0 &&
-                    (BuildConfig.DEBUG || binding!!.loginTwoFactor.text!!.length != 0 || binding!!.loginTwoFactor.visibility != View.VISIBLE)
+            binding!!.loginUsername.text!!.isNotEmpty() && binding!!.loginPassword.text!!.isNotEmpty() &&
+                    (BuildConfig.DEBUG || binding!!.loginTwoFactor.text!!.isNotEmpty() || binding!!.loginTwoFactor.visibility != View.VISIBLE)
         binding!!.loginButton.isEnabled = enabled
     }