diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c9ce597..5a2405c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 1. [](#bugfix)
     * Fix for homepage admin preview [#2426](https://github.com/getgrav/grav/issues/2426)
+    * Uploaded Avatar removed from user's yaml when editing the user [#1647](https://github.com/getgrav/grav-plugin-admin/issues/1647)
 
 # v1.9.1
 ## 04/13/2019
diff --git a/classes/adminbasecontroller.php b/classes/adminbasecontroller.php
index bd11c7a2..647c9e45 100644
--- a/classes/adminbasecontroller.php
+++ b/classes/adminbasecontroller.php
@@ -764,6 +764,8 @@ class AdminBaseController
                     } else {
                         $obj->modifyHeader($init_key, $new_data);
                     }
+                } elseif ($obj instanceof UserInterface and $key === 'avatar') {
+                    $obj->set($key, $files);
                 } else {
                     // TODO: [this is JS handled] if it's single file, remove existing and use set, if it's multiple, use join
                     $obj->join($key, $files); // stores
diff --git a/classes/admincontroller.php b/classes/admincontroller.php
index 9bdfde85..118c8443 100644
--- a/classes/admincontroller.php
+++ b/classes/admincontroller.php
@@ -708,7 +708,6 @@ class AdminController extends AdminBaseController
         }
 
         $user->update($data->toArray());
-        $user->undef('avatar');
 
         $user = $this->storeFiles($user);