diff --git a/.idea/inspectionProfiles/ktlint.xml b/.idea/inspectionProfiles/ktlint.xml
index 60b453cca1..2064cfd5a0 100644
--- a/.idea/inspectionProfiles/ktlint.xml
+++ b/.idea/inspectionProfiles/ktlint.xml
@@ -43,4 +43,4 @@
     </inspection_tool>
     <inspection_tool class="RedundantSemicolon" enabled="true" level="ERROR" enabled_by_default="true" />
   </profile>
-</component>
\ No newline at end of file
+</component>
diff --git a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
index cf0b2dcd5e..727f514ca6 100644
--- a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -317,22 +317,26 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mIsFirstAuthAttempt = savedInstanceState.getBoolean(KEY_AUTH_IS_FIRST_ATTEMPT_TAG);
         }
 
-        boolean webViewLoginMethod;
+        boolean webViewLoginMethod = false;
         String webloginUrl = null;
 
         if (MainApp.isClientBrandedPlus()) {
             RestrictionsManager restrictionsManager = (RestrictionsManager) getSystemService(Context.RESTRICTIONS_SERVICE);
             AppConfigManager appConfigManager = new AppConfigManager(this, restrictionsManager.getApplicationRestrictions());
-            webloginUrl = appConfigManager.getBaseUrl(MainApp.isClientBrandedPlus());
+
+            if (!TextUtils.isEmpty(appConfigManager.getBaseUrl(MainApp.isClientBrandedPlus()))) {
+                webloginUrl = appConfigManager.getBaseUrl(MainApp.isClientBrandedPlus()) + WEB_LOGIN;
+            }
         }
 
-        if (webloginUrl != null) {
+        if (!TextUtils.isEmpty(webloginUrl)) {
             webViewLoginMethod = true;
         } else if (getIntent().getBooleanExtra(EXTRA_USE_PROVIDER_AS_WEBLOGIN, false)) {
             webViewLoginMethod = true;
             webloginUrl = getString(R.string.provider_registration_server);
-        } else {
-            webViewLoginMethod = !TextUtils.isEmpty(getResources().getString(R.string.webview_login_url));
+        } else if (!TextUtils.isEmpty(getResources().getString(R.string.webview_login_url))) {
+            webViewLoginMethod = true;
+            webloginUrl = getResources().getString(R.string.webview_login_url);
             showWebViewLoginUrl = getResources().getBoolean(R.bool.show_server_url_input);
         }