diff --git a/app/templates/base.html b/app/templates/base.html
index b1a5402..05697b7 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -75,7 +75,7 @@
     </div>
     <div class="user-menu-dropdown" x-show="workspaceMenuOpen" @click.away="workspaceMenuOpen = false" x-transition>
       <div class="um-user-info">
-        <div class="um-avatar">{{ workspaceInitial }}</div>
+        <div class="um-avatar" style="{% if avatar_url %}background-image:url('{{ avatar_url }}');background-size:cover;{% else %}background:{{ avatar_color }};{% endif %}">{% if not avatar_url %}{{ user.full_name[:1].upper() if user and user.get('full_name') else workspaceInitial }}{% endif %}</div>
         <div>
           <div class="um-name">{{ user.full_name or user.login }}</div>
           <div class="um-plan">{{ user.email or '' }}</div>
diff --git a/app/templates/settings.html b/app/templates/settings.html
index 4cc3016..85edd04 100644
--- a/app/templates/settings.html
+++ b/app/templates/settings.html
@@ -262,8 +262,8 @@ document.addEventListener('alpine:init', function() {
       newTagName: '',
       newTagColor: '#787774',
       presetColors: ['#787774','#E03E3E','#D9730D','#DFAB01','#0F7B6C','#0B6E99','#6940A5','#AD1A72','#E16259','#D4A72C','#448361','#337EA9','#9065B0','#C94D8B'],
-      avatarUrl: '{{ user.avatar_url or "" }}',
-      avatarColor: '{{ user.get("avatar_color", "#3A3A3A") }}',
+      avatarUrl: '{{ avatar_url or "" }}',
+      avatarColor: '{{ avatar_color or "#3A3A3A" }}',
       avatarColors: ['#E03E3E','#D9730D','#DFAB01','#0F7B6C','#0B6E99','#6940A5','#AD1A72','#E16259','#448361','#337EA9','#9065B0','#C94D8B','#787774','#3A3A3A'],
       userInfo: {full_name: '{{ user.full_name or "" }}', login: '{{ user.login or "" }}', email: '{{ user.email or "" }}'},