diff --git a/src/components/CscConfirmationDialog.vue b/src/components/CscConfirmationDialog.vue
index dc8246d7..d629e7be 100644
--- a/src/components/CscConfirmationDialog.vue
+++ b/src/components/CscConfirmationDialog.vue
@@ -17,7 +17,7 @@
             flat
             @click="confirm"
         >
-            {{ $t('buttons.exit') }}
+            {{ $t('buttons.confirm') }}
         </q-btn>
     </csc-dialog>
 </template>
diff --git a/src/components/layouts/Conference.vue b/src/components/layouts/Conference.vue
index cd33b376..424d6301 100644
--- a/src/components/layouts/Conference.vue
+++ b/src/components/layouts/Conference.vue
@@ -87,7 +87,8 @@
         <csc-confirm-dialog
             ref="confirmDialog"
             title-icon="exit_to_app"
-            title="Exit conference"
+            :title="$t('conferencing.exitDialogTitle')"
+            :message="$t('conferencing.exitDialogText')"
             @confirm="leave"
         />
     </q-layout>
diff --git a/src/components/pages/Conference/CscConferenceJoin.vue b/src/components/pages/Conference/CscConferenceJoin.vue
index d22d492c..6e0452d5 100644
--- a/src/components/pages/Conference/CscConferenceJoin.vue
+++ b/src/components/pages/Conference/CscConferenceJoin.vue
@@ -15,7 +15,7 @@
                 id="csc-conf-link-input"
                 dark
                 :value="conferenceIdInput"
-                placeholder="Conference name"
+                :placeholder="$t('conferencing.idPlaceholder')"
                 align="left"
                 @change="conferenceIdChanged"
                 :disable="isJoining"
@@ -26,7 +26,7 @@
                     flat
                     icon="link"
                     @click="showShareDialog"
-                >Share</q-btn>
+                >{{ $t('conferencing.shareButtonLabel') }}</q-btn>
             </q-input>
             <q-btn
                 class="csc-button"
diff --git a/src/components/pages/Conference/CscShareConferenceDialog.vue b/src/components/pages/Conference/CscShareConferenceDialog.vue
index 489823b0..9bb8c133 100644
--- a/src/components/pages/Conference/CscShareConferenceDialog.vue
+++ b/src/components/pages/Conference/CscShareConferenceDialog.vue
@@ -1,7 +1,7 @@
 <template>
     <csc-dialog
         ref="dialogComp"
-        :title="'Share conference'"
+        :title="$t('conferencing.shareDialogTitle')"
         :titleIcon="'link'"
     >
         <div
@@ -22,7 +22,7 @@
             icon="link"
             @click="copy"
         >
-            Copy link
+            {{ $t('conferencing.copyLinkButtonLabel') }}
         </q-btn>
     </csc-dialog>
 </template>
diff --git a/src/locales/en.json b/src/locales/en.json
index 5a11e1d3..b5163992 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -539,6 +539,13 @@
         "busy": "busy"
     },
     "conferencing": {
-        "joinText": "Join conference with name"
+        "joinText": "Join conference with name",
+        "idPlaceholder": "Conference name",
+        "shareButtonLabel": "Share",
+        "shareDialogTitle": "Share conference",
+        "copyLinkButtonLabel": "Copy link",
+        "exitDialogTitle": "Leave conference",
+        "exitDialogText": "Leave current conference now!",
+        "leaveButtonLabel": "Leave"
     }
 }
diff --git a/src/store/conference.js b/src/store/conference.js
index 4c3d748f..5e11d46f 100644
--- a/src/store/conference.js
+++ b/src/store/conference.js
@@ -189,6 +189,9 @@ export default {
             let localMediaStream;
             media.build().then(($localMediaStream)=>{
                 localMediaStream = $localMediaStream;
+                localMediaStream.onVideoEnded(()=>{
+                    context.dispatch('createLocalMedia', MediaTypes.mic);
+                });
                 Vue.$conference.setLocalMediaStream(localMediaStream);
                 switch(type) {
                     default:
@@ -229,7 +232,9 @@ export default {
             }).then(()=>{
                 context.commit('localMediaSucceeded', localMediaStream);
             }).catch((err)=>{
-                context.commit('localMediaFailed', err.message);
+                if(!context.getters.hasLocalMediaStream) {
+                    context.commit('localMediaFailed', err.message);
+                }
             });
         },
         enableMicrophone(context) {