diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27ea5346a..5bc56e696 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -176,6 +176,12 @@
     * Doctrine filecache is now namespaced with prefix to support purging
     * Register all page types into `blueprint://pages` stream
 
+# v1.5.8
+## mm/dd/2019
+
+1. [](#improved)
+    * Improved `User` unserialize to not to break the object if serialized data is not what expected
+
 # v1.5.7
 ## 01/25/2019
 
diff --git a/system/src/Grav/Common/User/User.php b/system/src/Grav/Common/User/User.php
index b57e1a62e..b8bd9ff7b 100644
--- a/system/src/Grav/Common/User/User.php
+++ b/system/src/Grav/Common/User/User.php
@@ -341,6 +341,10 @@ class User extends Data
         $this->gettersVariable = 'items';
         $this->nestedSeparator = '.';
 
+        if (null === $this->items) {
+            $this->items = [];
+        }
+
         if (null === $this->blueprints) {
             $blueprints = new Blueprints;
             $this->blueprints = $blueprints->get('user/account');