diff --git a/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
index ea957a0d4ff3..a83d1bb7a919 100644
--- a/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -402,7 +402,7 @@ private void initWebViewLogin(String baseURL, boolean showLegacyLogin, boolean u
         setClient(progressBar);
 
         // show snackbar after 60s to switch back to old login method
-        if (showLegacyLogin) {
+        if (showLegacyLogin && getResources().getBoolean(R.bool.show_old_login)) {
             final String finalBaseURL = baseURL;
             new Handler().postDelayed(() -> DisplayUtils.createSnackbar(mLoginWebView,
                                                                         R.string.fallback_weblogin_text,
diff --git a/src/main/res/values/setup.xml b/src/main/res/values/setup.xml
index 1c0d9baafbd9..30a6dcbeabb0 100644
--- a/src/main/res/values/setup.xml
+++ b/src/main/res/values/setup.xml
@@ -111,6 +111,7 @@
     <!-- url for webview login, with the protocol prefix and with full url (normally /index.php/login/flow)
     If set, will replace all other login methods available -->
     <string name="webview_login_url" translatable="false"></string>
+    <bool name="show_old_login">true</bool>
 
     <!-- Files becomes Home -->
     <bool name="use_home">false</bool>