diff --git a/package-lock.json b/package-lock.json
index 1259c3529..7003749c0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
 				"highlight.js": "^11.9.0",
 				"http-server": "^14.1.1",
 				"idb": "^7.1.1",
+				"js-sha256": "^0.10.1",
 				"katex": "^0.16.9",
 				"marked": "^9.1.0",
 				"svelte-french-toast": "^1.2.0",
@@ -2527,6 +2528,11 @@
 				"jiti": "bin/jiti.js"
 			}
 		},
+		"node_modules/js-sha256": {
+			"version": "0.10.1",
+			"resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.10.1.tgz",
+			"integrity": "sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw=="
+		},
 		"node_modules/js-yaml": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -5910,6 +5916,11 @@
 			"integrity": "sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==",
 			"dev": true
 		},
+		"js-sha256": {
+			"version": "0.10.1",
+			"resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.10.1.tgz",
+			"integrity": "sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw=="
+		},
 		"js-yaml": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
diff --git a/package.json b/package.json
index 6a254f879..399b29129 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
 		"highlight.js": "^11.9.0",
 		"http-server": "^14.1.1",
 		"idb": "^7.1.1",
+		"js-sha256": "^0.10.1",
 		"katex": "^0.16.9",
 		"marked": "^9.1.0",
 		"svelte-french-toast": "^1.2.0",
diff --git a/src/lib/components/chat/SettingsModal.svelte b/src/lib/components/chat/SettingsModal.svelte
index 41707ceff..2c5c133f1 100644
--- a/src/lib/components/chat/SettingsModal.svelte
+++ b/src/lib/components/chat/SettingsModal.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import sha256 from 'js-sha256';
 	import Modal from '../common/Modal.svelte';
 
 	import { API_BASE_URL as BUILD_TIME_API_BASE_URL } from '$lib/constants';
@@ -12,7 +13,6 @@
 
 	// General
 	let API_BASE_URL = BUILD_TIME_API_BASE_URL;
-	let OPENAI_API_KEY = '';
 	let system = '';
 
 	// Models
@@ -28,6 +28,23 @@
 	let top_k = 40;
 	let top_p = 0.9;
 
+	// Addons
+	let gravatarEmail = '';
+	let OPENAI_API_KEY = '';
+
+	function getGravatarURL(email) {
+		// Trim leading and trailing whitespace from
+		// an email address and force all characters
+		// to lower case
+		const address = String(email).trim().toLowerCase();
+
+		// Create a SHA256 hash of the final string
+		const hash = sha256(address);
+
+		// Grab the actual image URL
+		return `https://www.gravatar.com/avatar/${hash}`;
+	}
+
 	const splitStream = (splitOn) => {
 		let buffer = '';
 		return new TransformStream({
@@ -166,7 +183,6 @@
 		console.log(settings);
 
 		API_BASE_URL = settings.API_BASE_URL ?? BUILD_TIME_API_BASE_URL;
-		OPENAI_API_KEY = settings.OPENAI_API_KEY ?? '';
 		system = settings.system ?? '';
 
 		seed = settings.seed ?? 0;
@@ -174,6 +190,9 @@
 		repeat_penalty = settings.repeat_penalty ?? 1.1;
 		top_k = settings.top_k ?? 40;
 		top_p = settings.top_p ?? 0.9;
+
+		OPENAI_API_KEY = settings.OPENAI_API_KEY ?? '';
+		gravatarEmail = settings.gravatarEmail ?? '';
 	}
 </script>
 
@@ -582,8 +601,43 @@
 						</div>
 					</div>
 				{:else if selectedTab === 'addons'}
-					<div class="flex flex-col h-full justify-between space-y-3 text-sm">
+					<form
+						class="flex flex-col h-full justify-between space-y-3 text-sm"
+						on:submit|preventDefault={() => {
+							saveSettings({
+								gravatarEmail: gravatarEmail !== '' ? gravatarEmail : undefined,
+								gravatarUrl: gravatarEmail !== '' ? getGravatarURL(gravatarEmail) : undefined,
+								OPENAI_API_KEY: OPENAI_API_KEY !== '' ? OPENAI_API_KEY : undefined
+							});
+							show = false;
+						}}
+					>
 						<div class=" space-y-3">
+							<div>
+								<div class=" mb-2.5 text-sm font-medium">
+									Gravatar Email <span class=" text-gray-400 text-sm">(optional)</span>
+								</div>
+								<div class="flex w-full">
+									<div class="flex-1">
+										<input
+											class="w-full rounded py-2 px-4 text-sm text-gray-300 bg-gray-800 outline-none"
+											placeholder="Enter Your Email"
+											bind:value={gravatarEmail}
+											autocomplete="off"
+											type="email"
+										/>
+									</div>
+								</div>
+								<div class="mt-2 text-xs text-gray-500">
+									Changes user profile image to match your <a
+										class=" text-gray-300 font-medium"
+										href="https://gravatar.com/"
+										target="_blank">Gravatar.</a
+									>
+								</div>
+							</div>
+
+							<hr class=" border-gray-700" />
 							<div>
 								<div class=" mb-2.5 text-sm font-medium">
 									OpenAI API Key <span class=" text-gray-400 text-sm">(optional)</span>
@@ -607,17 +661,12 @@
 						<div class="flex justify-end pt-3 text-sm font-medium">
 							<button
 								class=" px-4 py-2 bg-emerald-600 hover:bg-emerald-700 transition rounded"
-								on:click={() => {
-									saveSettings({
-										OPENAI_API_KEY: OPENAI_API_KEY !== '' ? OPENAI_API_KEY : undefined
-									});
-									show = false;
-								}}
+								type="submit"
 							>
 								Save
 							</button>
 						</div>
-					</div>
+					</form>
 				{/if}
 			</div>
 		</div>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 964b5960d..a1ed7c456 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -871,7 +871,11 @@
 									<div class="space-x-7 flex w-full">
 										<div class="">
 											<img
-												src="/{message.role == 'user' ? 'user' : 'favicon'}.png"
+												src="{message.role == 'user'
+													? settings.gravatarUrl
+														? settings.gravatarUrl
+														: '/user'
+													: '/favicon'}.png"
 												class=" max-w-[32px] object-cover rounded"
 											/>
 										</div>