diff --git a/src/lib/components/chat/Messages.svelte b/src/lib/components/chat/Messages.svelte
index 7e950d312..3c021664f 100644
--- a/src/lib/components/chat/Messages.svelte
+++ b/src/lib/components/chat/Messages.svelte
@@ -325,7 +325,7 @@
 				</div>
 				{#if selectedModelfile.user}
 					<div class="mt-0.5 text-sm font-normal text-gray-500 dark:text-gray-500">
-						By <a href="https://ollamahub.com/"
+						By <a href="https://ollamahub.com/m/{selectedModelfile.user.username}"
 							>{selectedModelfile.user.name
 								? selectedModelfile.user.name
 								: `@${selectedModelfile.user.username}`}</a
diff --git a/src/routes/(app)/modelfiles/create/+page.svelte b/src/routes/(app)/modelfiles/create/+page.svelte
index 6e4e3f7d2..18dee2d3d 100644
--- a/src/routes/(app)/modelfiles/create/+page.svelte
+++ b/src/routes/(app)/modelfiles/create/+page.svelte
@@ -228,7 +228,9 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
 			imageUrl = modelfile.imageUrl;
 			title = modelfile.title;
 			await tick();
-			tagName = `${modelfile.user.username}/${modelfile.tagName}`;
+			tagName = `${modelfile.user.username === 'hub' ? '' : `hub/`}${modelfile.user.username}/${
+				modelfile.tagName
+			}`;
 			desc = modelfile.desc;
 			content = modelfile.content;
 			suggestions =