diff --git a/store/app.py b/store/app.py
index 134319e..97bdbe1 100644
--- a/store/app.py
+++ b/store/app.py
@@ -416,7 +416,7 @@ def sso_login_callback():
     session["user"] = {
         "id": user_data["external_id"][0],
         "username": user_data["username"][0],
-        "avatar_url": user_data["avatar_url"][0],
+        "avatar_url": user_data["avatar_url"][0] if "avatar_url" in user_data else "",
     }
 
     if uri_to_redirect_to_after_login:
diff --git a/store/templates/base.html b/store/templates/base.html
index ecc5afd..09901b8 100644
--- a/store/templates/base.html
+++ b/store/templates/base.html
@@ -60,15 +60,17 @@
                         type="button"
                         class="group flex shrink-0 items-center rounded-md transition"
                       >
+                          {% if user['avatar_url'] %}
                           <img
                             alt="Avatar"
                             src="{{ user['avatar_url'] }}"
                             class="h-10 w-10 rounded-full object-cover"
                           >
-                          <p class="ms-2 text-left text-xs inline-block">
+                          {% endif %}
+                          <p class="pt-3 ms-2 text-left text-xs inline-block">
                             <strong class="block font-medium">{{ user['username'] }}</strong>
                           </p>
-                          <i class="fa fa-caret-down fa-fw" aria-hidden="true"></i>
+                          <i class="pt-3 fa fa-caret-down fa-fw" aria-hidden="true"></i>
                       </button>
                       <div
                         id="userMenu"
@@ -156,12 +158,14 @@
                           class="block rounded-md px-4 py-2 text-sm text-gray-500"
                           role="menuitem"
                         >
+                          {% if user['avatar_url'] %}
                           <img
                             alt="Avatar"
                             src="{{ user['avatar_url'] }}"
                             class="h-10 w-10 rounded-full object-cover inline-block"
                           >
-                          <p class="ms-2 inline-block text-left">
+                          {% endif %}
+                          <p class="pt-2 ms-2 inline-block text-left">
                             <strong class="font-medium">{{ user['username'] }}</strong>
                           </p>
                         </span>