diff --git a/lib/Controller/JoinController.php b/lib/Controller/JoinController.php
index 387865b..65ec43e 100644
--- a/lib/Controller/JoinController.php
+++ b/lib/Controller/JoinController.php
@@ -92,6 +92,7 @@ class JoinController extends PublicShareController
 		} elseif (empty($displayname) || strlen($displayname) < 3) {
 			$apiUrl = $this->config->getAppValue($this->appName, 'api.url');
 			$response = new TemplateResponse($this->appName, 'publicdisplayname', [
+				'room'             => $room->name,
 				'wrongdisplayname' => !empty($displayname) && strlen($displayname) < 3
 			], 'guest');
 
diff --git a/templates/publicdisplayname.php b/templates/publicdisplayname.php
index a6e30f4..55c0cbf 100644
--- a/templates/publicdisplayname.php
+++ b/templates/publicdisplayname.php
@@ -6,7 +6,7 @@
 ?>
 <form method="get" action="?">
 	<fieldset class="warning">
-		<!-- @TODO show room name -->
+		<h2><?php p($_['room']) ?></h2>
 		<?php if (!isset($_['wrongdisplayname']) || !$_['wrongdisplayname']): ?>
 			<p><?php p($l->t('How is your name?')); ?></p>
 		<?php endif; ?>