diff --git a/src/components/GuestWelcomeWindow.vue b/src/components/GuestWelcomeWindow.vue
index 45cf525277f..46b0342b989 100644
--- a/src/components/GuestWelcomeWindow.vue
+++ b/src/components/GuestWelcomeWindow.vue
@@ -38,6 +38,16 @@
 					<Check :size="20" />
 				</template>
 			</NcButton>
+
+			<div class="separator" />
+
+			<div class="login-info">
+				<span> {{ t('spreed', 'Do you already have an account?') }}</span>
+				<NcButton type="secondary"
+					:href="getLoginUrl()">
+					{{ t('spreed', 'Login') }}
+				</NcButton>
+			</div>
 		</div>
 	</NcModal>
 </template>
@@ -48,6 +58,7 @@ import { ref } from 'vue'
 import Check from 'vue-material-design-icons/CheckBold.vue'
 
 import { t } from '@nextcloud/l10n'
+import { generateUrl } from '@nextcloud/router'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
@@ -115,6 +126,13 @@ export default {
 		handleChooseUserName() {
 			this.guestNameStore.submitGuestUsername(this.token, this.guestUserName)
 		},
+
+		getLoginUrl() {
+			const currentUrl = window.location.pathname
+			const loginBaseUrl = generateUrl('/login')
+			const redirectUrl = encodeURIComponent(currentUrl)
+			return `${loginBaseUrl}?redirect_url=${redirectUrl}`
+		},
 	},
 }
 </script>
@@ -144,4 +162,16 @@ export default {
 .submit-button {
 	margin: 0 auto;
 }
+
+.login-info {
+	display: flex;
+	align-items: center;
+	gap: calc(var(--default-grid-baseline) * 2);
+	padding-top: calc(var(--default-grid-baseline) * 2);
+}
+
+.separator {
+    margin: calc(var(--default-grid-baseline) * 5) 0 var(--default-grid-baseline);
+    border-top: 1px solid;
+}
 </style>
diff --git a/src/components/LobbyScreen.vue b/src/components/LobbyScreen.vue
index 787285ab0b5..1aa892eac87 100644
--- a/src/components/LobbyScreen.vue
+++ b/src/components/LobbyScreen.vue
@@ -30,7 +30,7 @@
 					use-extended-markdown />
 			</div>
 		</div>
-		<SetGuestUsername v-if="currentUserIsGuest" />
+		<SetGuestUsername v-if="currentUserIsGuest" class="guest-info" />
 	</div>
 </template>
 
@@ -139,4 +139,10 @@ export default {
 	}
 }
 
+.guest-info {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+
 </style>
diff --git a/src/components/SetGuestUsername.vue b/src/components/SetGuestUsername.vue
index 24abff68e18..7f42ada3fab 100644
--- a/src/components/SetGuestUsername.vue
+++ b/src/components/SetGuestUsername.vue
@@ -10,7 +10,7 @@
 
 		<NcButton v-if="!isEditingUsername"
 			@click="handleEditUsername">
-			{{ t('spreed', 'Edit') }}
+			{{ t('spreed', 'Edit display name') }}
 			<template #icon>
 				<Pencil :size="20" />
 			</template>
@@ -27,6 +27,14 @@
 			@trailing-button-click="handleChooseUserName"
 			@keydown.enter="handleChooseUserName"
 			@keydown.esc="handleEditUsername" />
+
+		<div class="login-info">
+			<span> {{ t('spreed', 'Do you already have an account?') }}</span>
+			<NcButton type="secondary"
+				:href="getLoginUrl()">
+				{{ t('spreed', 'Login') }}
+			</NcButton>
+		</div>
 	</div>
 </template>
 
@@ -36,6 +44,7 @@ import escapeHtml from 'escape-html'
 import Pencil from 'vue-material-design-icons/Pencil.vue'
 
 import { t } from '@nextcloud/l10n'
+import { generateUrl } from '@nextcloud/router'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
@@ -127,6 +136,13 @@ export default {
 				})
 			}
 		},
+
+		getLoginUrl() {
+			const currentUrl = window.location.pathname
+			const loginBaseUrl = generateUrl('/login')
+			const redirectUrl = encodeURIComponent(currentUrl)
+			return `${loginBaseUrl}?redirect_url=${redirectUrl}`
+		},
 	},
 
 }
@@ -143,4 +159,11 @@ export default {
 	}
 }
 
+.login-info {
+	display: flex;
+	align-items: center;
+	gap: calc(var(--default-grid-baseline) * 2);
+	padding-top: calc(var(--default-grid-baseline) * 2);
+}
+
 </style>