diff --git a/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
index b6dc617a92b6..ef2513e47364 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 5acd70e8a7b0..5230a71aff4e 100644
--- a/src/main/res/values/setup.xml
+++ b/src/main/res/values/setup.xml
@@ -125,6 +125,7 @@
+ true
false