diff --git a/README.md b/README.md
index 683fe6fc6..24ea691b7 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ You can also sponsor the project as a way of saying "thank you".  But if you hav
 
 
 ## Project Links
-Demo App: https://app.remotely.one  
+Public Server: https://app.remotely.one  
 Website: https://remotely.one  
 Subreddit: https://www.reddit.com/r/remotely_app/  
 
diff --git a/Server/Components/ModalContents/EditDeviceGroup.razor b/Server/Components/ModalContents/EditDeviceGroup.razor
index d0304a5bd..3d0657c41 100644
--- a/Server/Components/ModalContents/EditDeviceGroup.razor
+++ b/Server/Components/ModalContents/EditDeviceGroup.razor
@@ -4,7 +4,7 @@
 @inject IToastService ToastService  
 
 <h5 class="text-info">
-    Editing @User?.UserName
+    Editing @EditUser?.UserName
 </h5>
 
 @foreach (var group in _deviceGroups)