diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/QrCodeFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/QrCodeFragment.kt
index 41f1be143..7f2814c42 100644
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/QrCodeFragment.kt
+++ b/app/src/main/java/org/linphone/activities/assistant/fragments/QrCodeFragment.kt
@@ -89,7 +89,7 @@ class QrCodeFragment : GenericFragment<AssistantQrCodeFragmentBinding>() {
         if (granted) {
             Log.i("[QR Code] CAMERA permission granted")
             coreContext.core.reloadVideoDevices()
-            coreContext.switchCamera()
+            viewModel.setBackCamera()
         } else {
             Log.w("[QR Code] CAMERA permission denied")
             findNavController().navigateUp()
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/QrCodeViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/QrCodeViewModel.kt
index cd2fdc0d8..69d6d2bc8 100644
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/QrCodeViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/QrCodeViewModel.kt
@@ -50,6 +50,8 @@ class QrCodeViewModel : ViewModel() {
     }
 
     fun setBackCamera() {
+        showSwitchCamera.value = coreContext.showSwitchCameraButton()
+
         for (camera in coreContext.core.videoDevicesList) {
             if (camera.contains("Back")) {
                 Log.i("[QR Code] Found back facing camera: $camera")
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b05ab3a2..d6c40cb3d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
     <string name="app_name">&appName;</string>
     <string name="app_name_debug">&appName; (debug)</string>
     <string name="service_name">&appName; Service</string>
-    <string name="service_auto_start_description">&appName; as been started automatically</string>
+    <string name="service_auto_start_description">&appName; has been started automatically</string>
     <string name="service_description">This is required to receive calls while in background</string>
     <string name="sync_account_name">&appName; contacts</string>
 
@@ -299,7 +299,7 @@
 
     <!-- Assistant remote provisioning -->
     <string name="assistant_remote_provisioning_title">Fetch remote configuration</string>
-    <string name="assistant_remote_provisioning_desc">Please provide your provisioning URL</string>
+    <string name="assistant_remote_provisioning_desc">Please provide your configuration URL</string>
     <string name="assistant_remote_provisioning_url">URL</string>
     <string name="assistant_remote_provisioning_wrong_format">Unknown URL format, can\'t download provisioning…</string>
     <string name="assistant_remote_provisioning_failure">Failed to download or apply remote provisioning profile…</string>