diff --git a/src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingController.java b/src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingController.java
index 4bb5159b48e20bed0693078c55d89ed3d0cddb34..d0936135988c2f8ed407703fe0e725cc6b62f316 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingController.java
+++ b/src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingController.java
@@ -244,8 +244,10 @@ public class BigBlueButtonMeetingController extends FormBasicController implemen
 		if(attendee != null && BigBlueButtonRecordingsPublishedRoles.has(publishTo, BigBlueButtonRecordingsPublishedRoles.all)) {
 			return true;
 		}
-		return ((administrator || moderator) && BigBlueButtonRecordingsPublishedRoles.has(publishTo, BigBlueButtonRecordingsPublishedRoles.coach))
-				|| BigBlueButtonRecordingsPublishedRoles.has(publishTo, BigBlueButtonRecordingsPublishedRoles.participant);
+		if(administrator || moderator) {
+			return BigBlueButtonRecordingsPublishedRoles.has(publishTo, BigBlueButtonRecordingsPublishedRoles.coach);
+		}
+		return BigBlueButtonRecordingsPublishedRoles.has(publishTo, BigBlueButtonRecordingsPublishedRoles.participant);
 	}
 	
 	private boolean isEnded() {
diff --git a/src/main/java/org/olat/modules/bigbluebutton/ui/PublishRecordingController.java b/src/main/java/org/olat/modules/bigbluebutton/ui/PublishRecordingController.java
index 170f54d6efaae5a977ee0d9b30ec561223d6033a..c24a28a1c5ce7a5ebdcd9062dce6d6bb2083e4a5 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/ui/PublishRecordingController.java
+++ b/src/main/java/org/olat/modules/bigbluebutton/ui/PublishRecordingController.java
@@ -62,8 +62,8 @@ public class PublishRecordingController extends FormBasicController {
 		KeyValues publishToKeyValues = new KeyValues();
 		publishToKeyValues.add(KeyValues.entry(BigBlueButtonRecordingsPublishedRoles.coach.name(), translate("publish.to.coach")));
 		publishToKeyValues.add(KeyValues.entry(BigBlueButtonRecordingsPublishedRoles.participant.name(), translate("publish.to.participant")));
-		publishToKeyValues.add(KeyValues.entry(BigBlueButtonRecordingsPublishedRoles.guest.name(), translate("publish.to.guest")));
 		publishToKeyValues.add(KeyValues.entry(BigBlueButtonRecordingsPublishedRoles.all.name(), translate("publish.to.all")));
+		publishToKeyValues.add(KeyValues.entry(BigBlueButtonRecordingsPublishedRoles.guest.name(), translate("publish.to.guest")));
 		publishEl = uifactory.addCheckboxesVertical("publish.to.list", "publish.to.list", formLayout,
 				publishToKeyValues.keys(), publishToKeyValues.values(), 1);
 		BigBlueButtonRecordingsPublishedRoles[] currentRoles = row.getReference().getPublishToEnum();
diff --git a/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties
index d6566a445eef5edb066915396b86e67c8617768d..3411a3f94220ce5894a1936d5f1bbe3c87eb1cd4 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties
@@ -82,7 +82,7 @@ meeting.join.button=Meeting beitreten
 meeting.layout=Darstellung
 meeting.leadTime=Vorlaufzeit (Min.)
 meeting.leadTime.explain=Die Vorlaufzeit ist nur f\u00fcr Moderatoren relevant.
-meeting.main.presenter=Main presenter
+meeting.main.presenter=Hauptmoderator
 meeting.name=Name
 meeting.permanent=Online-Termin Planung
 meeting.permanent.on=Ohne Datum
@@ -118,7 +118,7 @@ option.enabled.server=Server aktivieren
 option.recordingurl=Aufzeichnung URL
 publish.recording=Publizieren
 publish.to=Publizieren
-publish.to.all=Alle Teilnehmer des Meetings
+publish.to.all=Alle Teilnehmer des Meetings (aussen G\u00E4ste)
 publish.to.guest=G\u00e4ste
 publish.to.list=Publizieren f\u00fcr:
 publish.to.coach=Besitzer / Betreuer
diff --git a/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties
index 73cea11e866c64001f9705ca3ef0ab941200b4d1..32d588670a39dc0d1d371c4de4a1bbaf8dd4ad46 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties
@@ -82,7 +82,7 @@ meeting.join.button=Join the online-meeting
 meeting.layout=Layout
 meeting.leadTime=Prep time (min.)
 meeting.leadTime.explain=Prep time is only relevant for moderators.
-meeting.main.presenter=Hauptmoderator
+meeting.main.presenter=Main presenter
 meeting.name=Name
 meeting.permanent=Online-Meeting scheduling
 meeting.permanent.on=Without date
@@ -118,7 +118,7 @@ option.enabled.server=Activate server
 option.recordingurl=Recording URL
 publish.recording=Publish
 publish.to=Publish
-publish.to.all=All meeting's attendees
+publish.to.all=All meeting's attendees (without guests)
 publish.to.list=publish to:
 publish.to.guest=Guests
 publish.to.coach=Owners and coaches
diff --git a/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_fr.properties
index cb348fa5e99fd980eeb4f6f183f43ccf9f735985..ea534453a3103ac730f9073da04d75fca2ee8c56 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_fr.properties
@@ -121,10 +121,10 @@ option.enabled.server=Activer le serveur
 option.recordingurl=URL enregistrement
 publish.recording=Publier
 publish.to=Publier
-publish.to.all=Tous les participants du meeting
+publish.to.all=Tous les participants du meeting (hormis invit\u00E9s)
 publish.to.coach=Propri\u00E9taires et coaches
 publish.to.guest=Invit\u00E9s
-publish.to.list=publi\u00E9 pour\:
+publish.to.list=Publi\u00E9 pour\:
 publish.to.participant=Participants cours / groupe
 recording.browser.infos=Les enregistrements ne peuvent \u00EAtre vus qu'avec Google Chrome ou Firefox.
 recording.type.podcast=Podcast