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 30b88ba07347..b69637c9315b 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
@@ -1105,7 +1105,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 501c30b0a3d5..0099dc52896c 100644
--- a/app/src/main/res/values/setup.xml
+++ b/app/src/main/res/values/setup.xml
@@ -50,7 +50,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>