diff --git a/package-lock.json b/package-lock.json
index f2197e3..96a09c3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "redlight",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "redlight",
-      "version": "2.1.1",
+      "version": "2.1.2",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "axios": "^1.7.0",
diff --git a/package.json b/package.json
index 3b6a407..1bed2bc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "redlight",
   "private": true,
-  "version": "2.1.1",
+  "version": "2.1.2",
   "license": "GPL-3.0-or-later",
   "type": "module",
   "scripts": {
diff --git a/server/routes/federation.js b/server/routes/federation.js
index 61415b5..0b63197 100644
--- a/server/routes/federation.js
+++ b/server/routes/federation.js
@@ -1,4 +1,4 @@
-import { Router } from 'express';
+import { Router } from 'express';
 import { v4 as uuidv4 } from 'uuid';
 import { rateLimit } from 'express-rate-limit';
 import { getDb } from '../config/database.js';
@@ -40,7 +40,7 @@ export function wellKnownHandler(req, res) {
         federation_api: '/api/federation',
         public_key: getPublicKey(),
         software: 'Redlight',
-        version: '2.1.1',
+        version: '2.1.2',
     });
 }
 
diff --git a/src/pages/GuestJoin.jsx b/src/pages/GuestJoin.jsx
index aded304..96ad835 100644
--- a/src/pages/GuestJoin.jsx
+++ b/src/pages/GuestJoin.jsx
@@ -19,7 +19,7 @@ export default function GuestJoin() {
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(null);
   const [joining, setJoining] = useState(false);
-  const [name, setName] = useState(user?.name || '');
+  const [name, setName] = useState(user?.display_name || user?.name || '');
   const [accessCode, setAccessCode] = useState(searchParams.get('ac') || '');
   const [moderatorCode, setModeratorCode] = useState('');
   const [status, setStatus] = useState({ running: false });