diff --git a/system/src/Grav/Common/User/User.php b/system/src/Grav/Common/User/User.php
index 48bc6c9a6..262efed8c 100644
--- a/system/src/Grav/Common/User/User.php
+++ b/system/src/Grav/Common/User/User.php
@@ -224,9 +224,10 @@ class User extends Data
                 $this->undef('password');
             }
 
-            $this->undef('username');
-            $file->save($this->items);
-            $this->set('username', $username);
+            $data = $this->items;
+            unset($data['username'], $data['authenticated'], $data['authorized']);
+
+            $file->save($data);
         }
     }