diff --git a/app/observers/user_observer.rb b/app/observers/user_observer.rb
index 6bb3c471d0c..e969405a598 100644
--- a/app/observers/user_observer.rb
+++ b/app/observers/user_observer.rb
@@ -10,12 +10,11 @@ class UserObserver < BaseObserver
   end
 
   def after_save user
-    if user.username_changed?
-      if user.namespace
-        user.namespace.update_attributes(path: user.username)
-      else
-        user.create_namespace!(path: user.username, name: user.username)
-      end
+    # Ensure user has namespace
+    user.create_namespace!(path: user.username, name: user.username) unless user.namespace
+
+    if user.username_changed? || user.name_changed?
+      user.namespace.update_attributes(path: user.username, name: user.name)
     end
   end
 end