diff --git a/src/UserMenu.jsx b/src/UserMenu.jsx
index f85c5e5a..3e9f7354 100644
--- a/src/UserMenu.jsx
+++ b/src/UserMenu.jsx
@@ -64,7 +64,7 @@ export function UserMenu({
     <PopoverMenuTrigger placement="bottom right">
       <TooltipTrigger placement="bottom left">
         <Button variant="icon" className={styles.userButton}>
-          {isAuthenticated && !isPasswordlessUser ? (
+          {isAuthenticated && (!isPasswordlessUser || avatarUrl) ? (
             <Avatar
               size="sm"
               className={styles.avatar}
diff --git a/src/profile/ProfileModal.jsx b/src/profile/ProfileModal.jsx
index 3a4b5dcc..979e67be 100644
--- a/src/profile/ProfileModal.jsx
+++ b/src/profile/ProfileModal.jsx
@@ -36,7 +36,7 @@ export function ProfileModal({
 
       saveProfile({
         displayName,
-        avatar,
+        avatar: avatar && avatar.size > 0 ? avatar : undefined,
       });
     },
     [saveProfile]
@@ -65,7 +65,7 @@ export function ProfileModal({
               onChange={onChangeDisplayName}
             />
           </FieldRow>
-          {isAuthenticated && !isPasswordlessUser && (
+          {isAuthenticated && (
             <FieldRow>
               <InputField
                 type="file"