diff --git a/app/build.gradle b/app/build.gradle
index 5dcf27913..b9a78193a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         versionCode 39
-        versionName "2.0.0"
+        versionName "2.0.0beta6"
 
         flavorDimensions "default"
 
diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 9408c0825..0d31bad98 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -273,10 +273,13 @@ public class CallActivity extends AppCompatActivity {
         credentials = ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken());
         isVoiceOnlyCall = getIntent().getExtras().getBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, false);
 
-        if (getIntent().getExtras().containsKey(BundleKeys.KEY_MODIFIED_BASE_URL)) {
+        if (userEntity.getUserId().equals("-1")) {
             credentials = null;
-            baseUrl = getIntent().getExtras().getString(BundleKeys.KEY_MODIFIED_BASE_URL);
-        } else {
+        }
+
+        baseUrl = getIntent().getExtras().getString(BundleKeys.KEY_MODIFIED_BASE_URL, "");
+
+        if (TextUtils.isEmpty(baseUrl)) {
             baseUrl = userEntity.getBaseUrl();
         }
 
@@ -289,7 +292,7 @@ public class CallActivity extends AppCompatActivity {
             Log.e(TAG, "Failed to evict cache");
         }
 
-    if (getIntent().getExtras().containsKey(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) {
+        if (getIntent().getExtras().containsKey(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) {
             handleFromNotification();
         } else {
             initViews();
@@ -498,14 +501,7 @@ public class CallActivity extends AppCompatActivity {
             cameraVideoCapturer.switchCamera(new CameraVideoCapturer.CameraSwitchHandler() {
                 @Override
                 public void onCameraSwitchDone(boolean b) {
-                    if (b && cameraSwitchCount != -1) {
-                        if (cameraSwitchCount == camerasCount) {
-                            cameraSwitchCount = 0;
-                            pipVideoView.setMirror(false);
-                        } else {
-                            pipVideoView.setMirror(true);
-                        }
-                    }
+                    pipVideoView.setMirror(false);
                 }
 
                 @Override
@@ -580,7 +576,7 @@ public class CallActivity extends AppCompatActivity {
             }
 
             // setting this to true because it's not shown by default
-            pipVideoView.setMirror(true);
+            pipVideoView.setMirror(false);
             pipVideoView.init(rootEglBase.getEglBaseContext(), null);
             pipVideoView.setZOrderMediaOverlay(true);
             // disabled because it causes some devices to crash
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
index d713b2d46..ff23d8e46 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
@@ -338,7 +338,7 @@ public class SettingsController extends BaseController {
 
                             dbQueryDisposable = userUtils.createOrUpdateUser(null,
                                     null,
-                                    null, displayName, null, true,
+                                    null, displayName, null, null,
                                     userProfileOverall.getOcs().getData().getUserId(), userEntity.getId(), null, null)
                                     .subscribeOn(Schedulers.newThread())
                                     .observeOn(AndroidSchedulers.mainThread())