diff --git a/classes/admin.php b/classes/admin.php
index f8fb1084..fc1ef554 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -652,12 +652,12 @@ class Admin
             $data[$type] = $obj;
         } elseif (preg_match('|users/|', $type)) {
             $obj = User::load(preg_replace('|users/|', '', $type));
-            $obj->merge($this->cleanUserPost($post));
+            $obj->update($this->cleanUserPost($post));
 
             $data[$type] = $obj;
         } elseif (preg_match('|user/|', $type)) {
             $obj = User::load(preg_replace('|user/|', '', $type));
-            $obj->merge($this->cleanUserPost($post));
+            $obj->update($this->cleanUserPost($post));
 
             $data[$type] = $obj;
         } elseif (preg_match('|config/|', $type)) {
diff --git a/themes/grav/templates/partials/userinfo-avatar.html.twig b/themes/grav/templates/partials/userinfo-avatar.html.twig
index 7acdb3bb..693cea6d 100644
--- a/themes/grav/templates/partials/userinfo-avatar.html.twig
+++ b/themes/grav/templates/partials/userinfo-avatar.html.twig
@@ -1,5 +1,5 @@
 {% if data.avatar %}
-    <label><img src="{{ base_url_simple ~ '/' ~ (data.avatar|first).path }}" /></label>
+    <label><img src="{{ data.avatarUrl }}" /></label>
 {% else %}
     <label><img referrerpolicy="no-referrer" src="https://www.gravatar.com/avatar/{{ data.email|md5 }}?s=200" /></label>
 {% endif %}
\ No newline at end of file