diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserRegistry.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserRegistry.java
index 277ad8b..35a7451 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserRegistry.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserRegistry.java
@@ -200,6 +200,10 @@ public class UserRegistry {
             return false;
         }
 
+        if (user.getName().equals(newName)) {
+            return true;
+        }
+
         if (byName.containsKey(newName)) {
             return false;
         }