diff --git a/lib/Settings/Admin/AdminSettings.php b/lib/Settings/Admin/AdminSettings.php
index 396d5ca3cfe..02a0ad76fa9 100644
--- a/lib/Settings/Admin/AdminSettings.php
+++ b/lib/Settings/Admin/AdminSettings.php
@@ -105,6 +105,7 @@ public function getForm(): TemplateResponse {
 	}
 
 	protected function initGeneralSettings(): void {
+		$this->initialState->provideInitialState('ask_guest_username', (int) $this->serverConfig->getAppValue('spreed', 'ask_guest_username', '0'));
 		$this->initialState->provideInitialState('default_group_notification', (int) $this->serverConfig->getAppValue('spreed', 'default_group_notification', Participant::NOTIFY_MENTION));
 		$this->initialState->provideInitialState('conversations_files', (int) $this->serverConfig->getAppValue('spreed', 'conversations_files', '1'));
 		$this->initialState->provideInitialState('conversations_files_public_shares', (int) $this->serverConfig->getAppValue('spreed', 'conversations_files_public_shares', '1'));
diff --git a/lib/TInitialState.php b/lib/TInitialState.php
index 4ad6750ee01..6575a796e09 100644
--- a/lib/TInitialState.php
+++ b/lib/TInitialState.php
@@ -72,6 +72,11 @@ protected function publishInitialStateShared(): void {
 			'sip_dialin_info',
 			$this->talkConfig->getDialInInfo()
 		);
+
+		$this->initialState->provideInitialState(
+			'ask_guest_username',
+			(int) $this->serverConfig->getAppValue('spreed', 'ask_guest_username', '0')
+		);
 	}
 
 	protected function publishInitialStateForUser(IUser $user, IRootFolder $rootFolder, IAppManager $appManager): void {
diff --git a/src/components/AdminSettings/GeneralSettings.vue b/src/components/AdminSettings/GeneralSettings.vue
index 088176fdfa0..0b6b13705ee 100644
--- a/src/components/AdminSettings/GeneralSettings.vue
+++ b/src/components/AdminSettings/GeneralSettings.vue
@@ -24,6 +24,20 @@
 	<div id="general_settings" class="videocalls section">
 		<h2>{{ t('spreed', 'General settings') }}</h2>
 
+		<p>
+			<input id="ask_guest_username"
+				v-model="askGuestUsername"
+				type="checkbox"
+				name="ask_guest_username"
+				class="checkbox"
+				:disabled="loading || loadingAskGuestUsername"
+				@change="saveAskGuestUsername">
+			<label for="ask_guest_username">{{ t('spreed', 'Ask guest for a displayname') }}</label>
+		</p>
+		<p>
+			<em>{{ t('spreed', 'If guest have no display name, nextcloud will ask it on guest joining to conversation') }}</em>
+		</p>
+
 		<h3>{{ t('spreed', 'Default notification settings') }}</h3>
 
 		<p>
@@ -83,9 +97,11 @@ export default {
 	data() {
 		return {
 			loading: true,
+			loadingAskGuestUsername: false,
 			loadingConversationsFiles: false,
 			loadingDefaultGroupNotification: false,
 
+			askGuestUsername: false,
 			defaultGroupNotificationOptions,
 			defaultGroupNotification: defaultGroupNotificationOptions[1],
 
@@ -96,6 +112,7 @@ export default {
 
 	mounted() {
 		this.loading = true
+		this.askGuestUsername = parseInt(loadState('spreed', 'ask_guest_username')) === 1
 		this.conversationsFiles = parseInt(loadState('spreed', 'conversations_files')) === 1
 		this.defaultGroupNotification = defaultGroupNotificationOptions[parseInt(loadState('spreed', 'default_group_notification')) - 1]
 		this.conversationsFilesPublicShares = parseInt(loadState('spreed', 'conversations_files_public_shares')) === 1
@@ -103,6 +120,15 @@ export default {
 	},
 
 	methods: {
+		saveAskGuestUsername() {
+			this.loadingAskGuestUsername = true
+
+			OCP.AppConfig.setValue('spreed', 'ask_guest_username', this.askGuestUsername ? '1' : '0', {
+				success: function() {
+					this.loadingAskGuestUsername = false
+				}.bind(this),
+			})
+		},
 		saveDefaultGroupNotification() {
 			this.loadingDefaultGroupNotification = true
 
diff --git a/src/components/SetGuestUsername.vue b/src/components/SetGuestUsername.vue
index ae41f3fbb71..46a4540b131 100644
--- a/src/components/SetGuestUsername.vue
+++ b/src/components/SetGuestUsername.vue
@@ -21,48 +21,79 @@
 
 <template>
 	<!-- Guest username setting form -->
-	<form
-		class="username-form"
-		@submit.prevent="handleChooseUserName">
-		<h3>
-			{{ t('spreed', 'Display name: ') }} <strong>{{ actorDisplayName ? actorDisplayName : t('spreed', 'Guest') }}</strong>
-			<button
-				class="icon-rename"
-				@click.prevent="handleEditUsername">
-				{{ t('spreed', 'Edit') }}
-			</button>
-		</h3>
-		<div
-			v-if="isEditingUsername"
-			class="username-form__wrapper">
-			<input
-				ref="usernameInput"
-				v-model="guestUserName"
-				:placeholder="t('spreed', 'Guest')"
-				class="username-form__input"
-				type="text"
-				@keydown.enter="handleChooseUserName"
-				@keydown.esc="isEditingUsername = !isEditingUsername">
-			<button
-				class="username-form__button"
-				type="submit">
-				<div class="icon-confirm" />
-			</button>
-		</div>
-	</form>
+	<div>
+		<form
+			class="username-form"
+			@submit.prevent="handleChooseUserName">
+			<h3>
+				{{ t('spreed', 'Display name: ') }} <strong>{{ actorDisplayName ? actorDisplayName : t('spreed', 'Guest') }}</strong>
+				<button
+					class="icon-rename"
+					@click.prevent="handleEditUsername">
+					{{ t('spreed', 'Edit') }}
+				</button>
+			</h3>
+			<div
+				v-if="isEditingUsername"
+				class="username-form__wrapper">
+				<input
+					ref="usernameInput"
+					v-model="guestUserName"
+					:placeholder="t('spreed', 'Guest')"
+					class="username-form__input"
+					type="text"
+					@keydown.enter="handleChooseUserName"
+					@keydown.esc="isEditingUsername = !isEditingUsername">
+				<button
+					class="username-form__button"
+					type="submit">
+					<div class="icon-confirm" />
+				</button>
+			</div>
+		</form>
+		<Modal v-if="modal" :canClose="false">
+			<form
+				class="username-form"
+				@submit.prevent="handleChooseUserName2">
+				<div
+					class="username-form__wrapper"
+					style="display: block">
+					<h3>
+						{{ t('spreed', 'Display name: ') }}
+					</h3>
+					<input
+						ref="usernameInput"
+						v-model="guestUserName"
+						:placeholder="t('spreed', 'Guest')"
+						class="username-form__input"
+						type="text"
+						@keydown.enter="handleChooseUserName2">
+					<button
+						class="username-form__button"
+						type="submit">
+						<div class="icon-confirm" />
+					</button>
+				</div>
+			</form>
+		</Modal>
+	</div>
 </template>
 
 <script>
 import { setGuestUserName } from '../services/participantsService'
+import Modal from '@nextcloud/vue/dist/Components/Modal'
 
 export default {
 	name: 'SetGuestUsername',
-
+	components: {
+		Modal,
+	},
 	data() {
 		return {
 			guestUserName: '',
 			isEditingUsername: false,
 			delayHandleUserNameFromBrowserStorage: false,
+			modal: (this.$store.getters.getAskGuestUsername() === 1) && !localStorage.getItem('nick'),
 		}
 	},
 
@@ -140,6 +171,14 @@ export default {
 				})
 			}
 		},
+
+		handleChooseUserName2() {
+			if ((this.guestUserName === '') || !this.guestUserName) {
+				return false
+			}
+			this.handleChooseUserName()
+			this.modal = false
+		},
 	},
 
 }
diff --git a/src/store/guestNameStore.js b/src/store/guestNameStore.js
index 53e3ff014b2..814d9a09ed8 100644
--- a/src/store/guestNameStore.js
+++ b/src/store/guestNameStore.js
@@ -20,10 +20,12 @@
  *
  */
 import Vue from 'vue'
+import fromStateOr from './helper'
 
 const state = {
 	guestNames: {
 	},
+	askGuestUsername: fromStateOr('spreed', 'ask_guest_username', 0),
 }
 
 const getters = {
@@ -38,6 +40,10 @@ const getters = {
 		}
 		return t('spreed', 'Guest')
 	},
+
+	getAskGuestUsername: (state) => () => {
+		return state.askGuestUsername
+	},
 }
 
 const mutations = {