diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
index ee4176cae..224548e0d 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
@@ -17,6 +17,7 @@ import android.widget.EditText;
 import android.widget.TextView;
 
 import android.widget.Toast;
+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.WelcomeActivity;
@@ -81,7 +82,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
                 if(
                         usernameEdit.getText().length() != 0 &&
                                 passwordEdit.getText().length() != 0 &&
-                                ( twoFactorEdit.getText().length() != 0 || twoFactorEdit.getVisibility() != View.VISIBLE )
+                                ( BuildConfig.DEBUG || twoFactorEdit.getText().length() != 0 || twoFactorEdit.getVisibility() != View.VISIBLE )
                         ) {
                     loginButton.setEnabled(true);
                 } else {
@@ -179,8 +180,12 @@ public class LoginActivity extends AccountAuthenticatorActivity {
     }
 
     public void askUserForTwoFactorAuth() {
-        twoFactorEdit.setVisibility(View.VISIBLE);
-        showUserToastAndCancelDialog( R.string.login_failed_2fa_needed );
+        if(BuildConfig.DEBUG) {
+            twoFactorEdit.setVisibility(View.VISIBLE);
+            showUserToastAndCancelDialog( R.string.login_failed_2fa_needed );
+        }else{
+            showUserToastAndCancelDialog( R.string.login_failed_2fa_not_supported );
+        }
     }
 
     public void showUserToastAndCancelDialog( int resId ) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 03f0c0402..3ae5a3276 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -178,5 +178,6 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="maximum_limit">Maximum Limit</string>
   <string name="maximum_limit_alert">Maximum limit should be 500</string>
   <string name="set_limit">Set Recent Upload Limit</string>
+  <string name="login_failed_2fa_not_supported">Two factor authentication is currently not supported.</string>
 
 </resources>