diff --git a/CHANGELOG.md b/CHANGELOG.md
index d67fe453d..764e6e5d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
     * Broke out Medium timestamp so it's not cleared on `reset()s`
     * Fixed issue with `redirect_trailing_slash` losing query string [#2269](https://github.com/getgrav/grav/issues/2269)
     * Fixed failed login if user attempts to log in with upper case non-english letters
+    * Removed extra authenticated/authorized fields when saving existing user from a form
     
 # v1.6.0-beta.7
 ## 12/14/2018
diff --git a/system/src/Grav/Common/User/User.php b/system/src/Grav/Common/User/User.php
index 262efed8c..715495041 100644
--- a/system/src/Grav/Common/User/User.php
+++ b/system/src/Grav/Common/User/User.php
@@ -86,6 +86,13 @@ class User extends Data
         return $user;
     }
 
+    public function __construct(array $items = [], $blueprints = null)
+    {
+        unset($items['authenticated'], $items['authorized']);
+
+        parent::__construct($items, $blueprints);
+    }
+
     /**
      * Remove user account.
      *