diff --git a/server.js b/server.js
index 400fb6f..5482b5a 100644
--- a/server.js
+++ b/server.js
@@ -347,7 +347,7 @@ if(variables.serviceWeb) {
         res.render('voucher', {
             baseUrl: req.headers['x-ingress-path'] ? req.headers['x-ingress-path'] : '',
             user: user,
-            userIcon: crypto.createHash('sha256').update(user.email).digest('hex'),
+            userIcon: req.oidc ? crypto.createHash('sha256').update(user.email).digest('hex') : '',
             authDisabled: variables.authDisabled,
             info: req.flashMessage.type === 'info',
             info_text: req.flashMessage.message || '',
@@ -393,7 +393,7 @@ if(variables.serviceWeb) {
         res.render('status', {
             baseUrl: req.headers['x-ingress-path'] ? req.headers['x-ingress-path'] : '',
             user: user,
-            userIcon: crypto.createHash('sha256').update(user.email).digest('hex'),
+            userIcon: req.oidc ? crypto.createHash('sha256').update(user.email).digest('hex') : '',
             authDisabled: variables.authDisabled,
             status: status()
         });
diff --git a/template/partials/navigation.ejs b/template/partials/navigation.ejs
index aa0f907..5c22846 100644
--- a/template/partials/navigation.ejs
+++ b/template/partials/navigation.ejs
@@ -25,7 +25,13 @@
                         <button id="user-menu-button" class="flex items-center focus:outline-none focus:ring-2 focus:ring-sky-600 rounded-full">
                             <span class="absolute -inset-1.5"></span>
                             <span class="sr-only">Open user menu</span>
-                            <img class="h-8 w-8 rounded-full" alt="User Image" width="44" height="44" src="https://gravatar.com/avatar/<%= userIcon %>?d=mp">
+                            <% if(userIcon !== '') { %>
+                                <img class="h-8 w-8 rounded-full" alt="User Image" width="44" height="44" src="https://gravatar.com/avatar/<%= userIcon %>?d=mp">
+                            <% } else { %>
+                                <svg xmlns="http://www.w3.org/2000/svg" viewBox="2 2 20 20" fill="currentColor" class="h-8 w-8 rounded-full text-gray-500 dark:text-gray-400">
+                                    <path fill-rule="evenodd" d="M18.685 19.097A9.723 9.723 0 0 0 21.75 12c0-5.385-4.365-9.75-9.75-9.75S2.25 6.615 2.25 12a9.723 9.723 0 0 0 3.065 7.097A9.716 9.716 0 0 0 12 21.75a9.716 9.716 0 0 0 6.685-2.653Zm-12.54-1.285A7.486 7.486 0 0 1 12 15a7.486 7.486 0 0 1 5.855 2.812A8.224 8.224 0 0 1 12 20.25a8.224 8.224 0 0 1-5.855-2.438ZM15.75 9a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0Z" clip-rule="evenodd" />
+                                </svg>
+                            <% } %>
                         </button>
                         <div id="user-dropdown" class="hidden absolute bg-white dark:bg-gray-800 right-0 mt-2 w-64 rounded-md shadow-lg py-1 ring-1 ring-black ring-opacity-5">
                             <div class="px-4 py-2 text-sm text-gray-600 dark:text-gray-400 border-b border-black/5 dark:border-white/5">