diff --git a/src/components/LobbyScreen.vue b/src/components/LobbyScreen.vue
index b3dd3579123..f0dd96e6359 100644
--- a/src/components/LobbyScreen.vue
+++ b/src/components/LobbyScreen.vue
@@ -19,20 +19,28 @@
   -->
 
 <template>
-	<div class="lobby emptycontent">
-		<div class="icon icon-lobby" />
-		<h2>{{ currentConversationName }}</h2>
-		<p>{{ message }}</p>
+	<div class="lobby">
+		<div class="lobby emptycontent">
+			<div class="icon icon-lobby" />
+			<h2>{{ currentConversationName }}</h2>
+			<p>{{ message }}</p>
+		</div>
+		<SetGuestUsername />
 	</div>
 </template>
 
 <script>
 import moment from '@nextcloud/moment'
+import SetGuestUsername from './SetGuestUsername'
 
 export default {
 
 	name: 'LobbyScreen',
 
+	components: {
+		SetGuestUsername,
+	},
+
 	computed: {
 
 		token() {
@@ -64,3 +72,12 @@ export default {
 
 }
 </script>
+
+<style lang="scss" scoped>
+
+.lobby {
+	display: flex;
+	flex-direction: column;
+}
+
+</style>
diff --git a/src/components/SetGuestUsername.vue b/src/components/SetGuestUsername.vue
index e4915a9759b..f85e8c4b390 100644
--- a/src/components/SetGuestUsername.vue
+++ b/src/components/SetGuestUsername.vue
@@ -115,6 +115,7 @@ export default {
 /** Username form for guest users */
 .username-form {
 	padding: 0 12px;
+	margin:auto;
 	& .icon-rename {
 		margin-left: 8px;
 		padding-left: 36px;
@@ -125,7 +126,7 @@ export default {
 	}
 	&__input {
 		padding-right: var(--clickable-area);
-		width: 300px;
+		width: 230px;
 	}
 	&__button {
 		margin-left: -44px;