diff --git a/app/src/debug/res/values/setup.xml b/app/src/debug/res/values/setup.xml
new file mode 100644
index 000000000000..046f7830a774
--- /dev/null
+++ b/app/src/debug/res/values/setup.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- webview_login_url should be empty in debug mode to show login url input screen
+    this will be useful in switching the environments during testing -->
+    <string name="webview_login_url" translatable="false" />
+</resources>
\ No newline at end of file
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 5e5f1f897acb..78f80d7bfee6 100644
--- a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -460,6 +460,10 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
             public void onPageFinished(WebView view, String url) {
                 super.onPageFinished(view, url);
 
+                //scroll to top when url loads
+                //because directly loading Telekom login page it scrolls down automatically
+                view.scrollTo(0,0);
+
                 accountSetupWebviewBinding.loginWebviewProgressBar.setVisibility(View.GONE);
                 accountSetupWebviewBinding.loginWebview.setVisibility(View.VISIBLE);
 
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java
index 4c1e79f28de8..01084174325b 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java
@@ -109,7 +109,10 @@ protected void onNewIntent(Intent intent) {
     protected void onRestart() {
         Log_OC.v(TAG, "onRestart() start");
         super.onRestart();
-        mixinRegistry.onRestart();
+        //Fix of NMC-2303 and NMC-2441
+        if (enableAccountHandling) {
+            mixinRegistry.onRestart();
+        }
     }
 
     private void onThemeSettingsModeChanged() {
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
index 61ad9629e005..52b2cde9f482 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
@@ -1176,7 +1176,8 @@ protected void onStop() {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onAccountRemovedEvent(AccountRemovedEvent event) {
-        restart();
+        //NMC customization
+        finish();
     }
 
     /**
diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml
index 5eaf8e92d387..70d1188c4f80 100644
--- a/app/src/main/res/values/setup.xml
+++ b/app/src/main/res/values/setup.xml
@@ -58,7 +58,7 @@
     <color name="login_text_hint_color">#7fC0E3</color>
 
     <!-- Multiaccount support -->
-    <bool name="multiaccount_support">true</bool>
+    <bool name="multiaccount_support">false</bool>
 
     <!-- Drawer options -->
     <bool name="recently_modified_enabled">false</bool>
diff --git a/app/src/release/res/values/setup.xml b/app/src/release/res/values/setup.xml
new file mode 100644
index 000000000000..a4600f0ff88a
--- /dev/null
+++ b/app/src/release/res/values/setup.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- webview_login_url prod -->
+    <string name="webview_login_url" translatable="false" >https://magentacloud.de/index.php/login/flow</string>
+</resources>
\ No newline at end of file