diff --git a/appview/oauth/handler.go b/appview/oauth/handler.go
index 4d7c51e5..5f23ac65 100644
--- a/appview/oauth/handler.go
+++ b/appview/oauth/handler.go
@@ -167,7 +167,7 @@ func (o *OAuth) addToDefaultKnot(did string) {
 		return
 	}
 
-	l.Debug("addings to default knot")
+	l.Debug("adding to default knot")
 	session, err := o.createAppPasswordSession(o.Config.Core.TmpAltAppPassword, consts.IcyDid)
 	if err != nil {
 		l.Error("failed to create session", "err", err)
diff --git a/appview/oauth/oauth.go b/appview/oauth/oauth.go
index 47e67556..4aa90221 100644
--- a/appview/oauth/oauth.go
+++ b/appview/oauth/oauth.go
@@ -169,10 +169,16 @@ func (o *OAuth) DeleteSession(w http.ResponseWriter, r *http.Request) error {
 
 	// delete the session
 	err1 := o.ClientApp.Logout(r.Context(), sessDid, sessId)
+	if err1 != nil {
+		err1 = fmt.Errorf("failed to logout: %w", err1)
+	}
 
 	// remove the cookie
 	userSession.Options.MaxAge = -1
 	err2 := o.SessStore.Save(r, w, userSession)
+	if err2 != nil {
+		err2 = fmt.Errorf("failed to save into session store: %w", err2)
+	}
 
 	return errors.Join(err1, err2)
 }
diff --git a/appview/pages/templates/user/fragments/editAvatar.html b/appview/pages/templates/user/fragments/editAvatar.html
index 2b099ee4..ce985d39 100644
--- a/appview/pages/templates/user/fragments/editAvatar.html
+++ b/appview/pages/templates/user/fragments/editAvatar.html
@@ -2,9 +2,8 @@
 <form
   hx-post="/profile/avatar"
   hx-encoding="multipart/form-data"
-  hx-indicator="#spinner"
   hx-swap="none"
-  class="flex flex-col gap-2">
+  class="flex flex-col gap-2 group/form">
   <label for="avatar-file" class="uppercase p-0">
     Upload or Remove Avatar
   </label>
@@ -22,32 +21,34 @@
       file:bg-gray-100 file:text-gray-700
       dark:file:bg-gray-700 dark:file:text-gray-300
       hover:file:bg-gray-200 dark:hover:file:bg-gray-600" />
-  <div id="avatar-error" class="text-red-500 dark:text-red-400 text-sm min-h-5"></div>
   <div class="flex flex-col gap-2 pt-2">
     <button type="submit" class="btn w-full flex items-center justify-center gap-2">
-      <span class="inline-flex gap-2 items-center">{{ i "upload" "size-4" }} upload</span>
-      <span id="spinner" class="group">
-        {{ i "loader-circle" "ml-2 w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
-      </span>
-    </button>
-    <button
-      type="button"
-      hx-delete="/profile/avatar"
-      hx-confirm="Are you sure you want to remove your profile picture?"
-      hx-swap="none"
-      class="btn w-full flex items-center justify-center gap-2">
-      {{ i "trash-2" "size-4" }}
-      remove avatar
+        {{ i "upload" "size-4 inline group-[.htmx-request]/form:hidden" }} 
+        {{ i "loader-circle" "size-4 animate-spin hidden group-[.htmx-request]/form:inline" }}
+        upload
     </button>
+    {{ if .Profile.Avatar }}
+      <button
+        type="button"
+        hx-delete="/profile/avatar"
+        hx-confirm="Are you sure you want to remove your profile picture?"
+        hx-swap="none"
+        class="btn w-full flex items-center justify-center gap-2 group">
+        {{ i "trash-2" "size-4 inline group-[.htmx-request]:hidden" }}
+        {{ i "loader-circle" "size-4 animate-spin hidden group-[.htmx-request]:inline" }}
+        remove avatar
+      </button>
+    {{ end }}
     <button
       id="cancel-avatar-btn"
       type="button"
       popovertarget="avatar-upload-modal"
       popovertargetaction="hide"
-      class="btn w-full flex items-center justify-center gap-2 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-300">
+      class="btn text-red-500 dark:text-red-400 w-full flex items-center justify-center gap-2">
       {{ i "x" "size-4" }}
       cancel
     </button>
   </div>
+  <div id="avatar-error" class="text-red-500 dark:text-red-400 text-sm"></div>
 </form>
 {{ end }}