diff --git a/client/web/admin/src/components/CUploader.vue b/client/web/admin/src/components/CUploader.vue
index 1285620d0..644c16cad 100644
--- a/client/web/admin/src/components/CUploader.vue
+++ b/client/web/admin/src/components/CUploader.vue
@@ -158,6 +158,7 @@ export default {
 
     onError (e, message) {
       this.error = message
+      this.active = null
     },
 
     onUploadProgress (file, progress, bytesSent) {
diff --git a/client/web/admin/src/components/User/CUserEditorAvatar.vue b/client/web/admin/src/components/User/CUserEditorAvatar.vue
index 0840dd33e..df22aa38e 100644
--- a/client/web/admin/src/components/User/CUserEditorAvatar.vue
+++ b/client/web/admin/src/components/User/CUserEditorAvatar.vue
@@ -72,7 +72,6 @@
         class="float-right"
         :processing="processing"
         :success="success"
-        :disabled="saveDisabled"
         @submit="$emit('submit', user)"
       />
     </template>
@@ -80,7 +79,6 @@
 </template>
 
 <script>
-import { NoID } from '@cortezaproject/corteza-js'
 import CSubmitButton from 'corteza-webapp-admin/src/components/CSubmitButton'
 import CUploaderWithPreview from 'corteza-webapp-admin/src/components/CUploaderWithPreview'
 
@@ -112,26 +110,9 @@ export default {
       type: Boolean,
       value: false,
     },
-
-    canCreate: {
-      type: Boolean,
-      required: true,
-    },
   },
 
   computed: {
-    fresh () {
-      return !this.user.userID || this.user.userID === NoID
-    },
-
-    editable () {
-      return this.fresh ? this.canCreate : this.user.canUpdateUser
-    },
-
-    saveDisabled () {
-      return !this.editable
-    },
-
     isKindAvatar () {
       return this.user.meta.avatarKind === 'avatar'
     },
diff --git a/client/web/admin/src/views/System/User/Editor.vue b/client/web/admin/src/views/System/User/Editor.vue
index dd8d2b0d5..ae51b3012 100644
--- a/client/web/admin/src/views/System/User/Editor.vue
+++ b/client/web/admin/src/views/System/User/Editor.vue
@@ -55,9 +55,8 @@
     <c-user-editor-avatar
       v-if="user && userID && $Settings.get('auth.internal.profile-avatar.Enabled', false)"
       :user="user"
-      :processing="info.processing"
-      :success="info.success"
-      :can-create="canCreate"
+      :processing="avatar.processing"
+      :success="avatar.success"
       class="mt-3"
       @submit="onAvatarSubmit"
       @onUpload="onAvatarUpload"
@@ -154,6 +153,10 @@ export default {
         processing: false,
         success: false,
       },
+      avatar: {
+        processing: false,
+        success: false,
+      },
       password: {
         processing: false,
         success: false,
@@ -207,10 +210,10 @@ export default {
       return system.UserEvent(res)
     },
 
-    fetchUser () {
+    async fetchUser () {
       this.incLoader()
 
-      this.$SystemAPI.userRead({ userID: this.userID })
+      return this.$SystemAPI.userRead({ userID: this.userID })
         .then(user => {
           this.user = new system.User(user)
         })
@@ -286,7 +289,7 @@ export default {
     },
 
     onAvatarSubmit (user) {
-      this.info.processing = true
+      this.avatar.processing = true
 
       const payload = {
         userID: user.userID,
@@ -295,15 +298,14 @@ export default {
       }
 
       this.$SystemAPI.userProfileAvatarInitial(payload)
+        .then(() => this.fetchUser())
         .then(() => {
-          this.fetchUser()
-          this.$auth.handle()
-          this.animateSuccess('info')
-          this.toastSuccess(this.$t('notification:user.avatarUpload.success'))
+          this.animateSuccess('avatar')
+          this.toastSuccess(this.$t('notification:user.avatarSettings.success'))
         })
-        .catch(this.toastErrorHandler(this.$t('notification:user.avatarUpload.error')))
+        .catch(this.toastErrorHandler(this.$t('notification:user.avatarSettings.error')))
         .finally(() => {
-          this.info.processing = false
+          this.avatar.processing = false
         })
     },
 
@@ -409,7 +411,7 @@ export default {
         ...original.filter(roleID => !active.includes(roleID)).map(roleID => {
           return this.$SystemAPI.userMembershipRemove({ roleID, userID })
         }),
-        // all new memerships
+        // all new memberships
         ...active.filter(roleID => !original.includes(roleID)).map(roleID => {
           return this.$SystemAPI.userMembershipAdd({ roleID, userID })
         }),
@@ -482,16 +484,17 @@ export default {
     },
 
     onAvatarUpload () {
-      this.fetchUser()
+      this.fetchUser().then(() => {
+        this.toastSuccess(this.$t('notification:user.avatarUpload.success'))
+      })
     },
 
     onResetAvatar () {
       const userID = this.userID
 
       this.$SystemAPI.userDeleteAvatar({ userID })
+        .then(() => this.fetchUser())
         .then(() => {
-          this.fetchUser()
-
           this.toastSuccess(this.$t('notification:user.avatarDelete.success'))
         })
         .catch(this.toastErrorHandler(this.$t('notification:user.avatarDelete.error')))
diff --git a/locale/en/corteza-webapp-admin/notification.yaml b/locale/en/corteza-webapp-admin/notification.yaml
index 725f27b7f..55fb21ab9 100644
--- a/locale/en/corteza-webapp-admin/notification.yaml
+++ b/locale/en/corteza-webapp-admin/notification.yaml
@@ -44,8 +44,11 @@ user:
   import:
     success: Users imported successfully
   avatarUpload:
-    success: Avatar uploaded
+    success: Avatar updated
     error: Avatar upload failed
+  avatarSettings:
+    success: Avatar settings updated
+    error: Avatar settings update failed
   avatarDelete:
     success: Avatar deleted
     error: Avatar delete failed