diff --git a/messages/en.json b/messages/en.json
index 5342deb9..94b2242b 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -408,7 +408,8 @@
     "noPromptsOwner": "You haven't created any prompts yet",
     "createFirstPrompt": "Create your first prompt",
     "upvotesReceived": "upvotes received",
-    "editProfile": "Edit Profile"
+    "editProfile": "Edit Profile",
+    "unclaimedUser": "Unclaimed"
   },
   "subscription": {
     "subscribe": "Subscribe",
diff --git a/messages/tr.json b/messages/tr.json
index f1727ec0..285fb031 100644
--- a/messages/tr.json
+++ b/messages/tr.json
@@ -408,7 +408,8 @@
     "noPromptsOwner": "Henüz prompt oluşturmadınız",
     "createFirstPrompt": "İlk promptunuzu oluşturun",
     "upvotesReceived": "beğeni aldı",
-    "editProfile": "Profili Düzenle"
+    "editProfile": "Profili Düzenle",
+    "unclaimedUser": "Sahipsiz"
   },
   "subscription": {
     "subscribe": "Abone Ol",
diff --git a/src/app/[username]/page.tsx b/src/app/[username]/page.tsx
index 71675598..23832989 100644
--- a/src/app/[username]/page.tsx
+++ b/src/app/[username]/page.tsx
@@ -72,6 +72,7 @@ export default async function UserProfilePage({ params, searchParams }: UserProf
       id: true,
       name: true,
       username: true,
+      email: true,
       avatar: true,
       role: true,
       createdAt: true,
@@ -90,6 +91,7 @@ export default async function UserProfilePage({ params, searchParams }: UserProf
   const page = parseInt(pageParam || "1");
   const perPage = 12;
   const isOwner = session?.user?.id === user.id;
+  const isUnclaimed = user.email?.endsWith("@unclaimed.prompts.chat") ?? false;
 
   // Build where clause - show private prompts only if owner
   const where = {
@@ -235,7 +237,14 @@ export default async function UserProfilePage({ params, searchParams }: UserProf
                   <Badge variant="default" className="text-xs">Admin</Badge>
                 )}
               </div>
-              <p className="text-muted-foreground text-sm mb-3">@{user.username}</p>
+              <p className="text-muted-foreground text-sm mb-3 flex items-center gap-2">
+                @{user.username}
+                {isUnclaimed && (
+                  <Badge variant="outline" className="text-[10px] text-amber-600 border-amber-500/30 bg-amber-500/10">
+                    {t("unclaimedUser")}
+                  </Badge>
+                )}
+              </p>
             </div>
             {isOwner && (
               <Button variant="outline" size="sm" asChild>
diff --git a/src/app/api/auth/register/route.ts b/src/app/api/auth/register/route.ts
index 36327f4b..923b8e5e 100644
--- a/src/app/api/auth/register/route.ts
+++ b/src/app/api/auth/register/route.ts
@@ -6,7 +6,7 @@ import { getConfig } from "@/lib/config";
 
 const registerSchema = z.object({
   name: z.string().min(2),
-  username: z.string().min(3).regex(/^[a-zA-Z0-9_]+$/),
+  username: z.string().min(1).regex(/^[a-zA-Z0-9_]+$/),
   email: z.string().email(),
   password: z.string().min(6),
 });
diff --git a/src/app/api/user/profile/route.ts b/src/app/api/user/profile/route.ts
index 0dae1d88..e753159b 100644
--- a/src/app/api/user/profile/route.ts
+++ b/src/app/api/user/profile/route.ts
@@ -7,7 +7,7 @@ const updateProfileSchema = z.object({
   name: z.string().min(1).max(100),
   username: z
     .string()
-    .min(3)
+    .min(1)
     .max(30)
     .regex(/^[a-zA-Z0-9_]+$/),
   avatar: z.string().url().optional().or(z.literal("")),
diff --git a/src/components/auth/register-form.tsx b/src/components/auth/register-form.tsx
index 072bb16a..e8040852 100644
--- a/src/components/auth/register-form.tsx
+++ b/src/components/auth/register-form.tsx
@@ -21,7 +21,7 @@ import { toast } from "sonner";
 
 const registerSchema = z.object({
   name: z.string().min(2, "Name must be at least 2 characters"),
-  username: z.string().min(3, "Username must be at least 3 characters").regex(/^[a-zA-Z0-9_]+$/, "Username can only contain letters, numbers, and underscores"),
+  username: z.string().min(1, "Username is required").regex(/^[a-zA-Z0-9_]+$/, "Username can only contain letters, numbers, and underscores"),
   email: z.string().email("Invalid email address"),
   password: z.string().min(6, "Password must be at least 6 characters"),
   confirmPassword: z.string(),
diff --git a/src/components/prompts/prompt-card.tsx b/src/components/prompts/prompt-card.tsx
index 8d694feb..280dede4 100644
--- a/src/components/prompts/prompt-card.tsx
+++ b/src/components/prompts/prompt-card.tsx
@@ -13,6 +13,7 @@ import { prettifyJson } from "@/lib/format";
 import { PinButton } from "@/components/prompts/pin-button";
 import { RunPromptButton } from "@/components/prompts/run-prompt-button";
 import { VariableFillModal, hasVariables, renderContentWithVariables } from "@/components/prompts/variable-fill-modal";
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 
 export interface PromptCardProps {
   prompt: {
@@ -205,7 +206,11 @@ export function PromptCard({ prompt, showPinButton = false, isPinned = false }:
 
         {/* Footer */}
         <div className="flex items-center justify-between text-[11px] text-muted-foreground pt-2 border-t mt-auto">
-          <Link href={`/@${prompt.author.username}`} className="hover:text-foreground">
+          <Link href={`/@${prompt.author.username}`} className="hover:text-foreground flex items-center gap-1.5">
+            <Avatar className="h-4 w-4">
+              <AvatarImage src={prompt.author.avatar || undefined} alt={prompt.author.username} />
+              <AvatarFallback className="text-[8px]">{prompt.author.username[0]?.toUpperCase()}</AvatarFallback>
+            </Avatar>
             @{prompt.author.username}{prompt.contributorCount ? ` +${prompt.contributorCount}` : ""}
           </Link>
           <div className="flex items-center gap-2">
diff --git a/src/components/settings/profile-form.tsx b/src/components/settings/profile-form.tsx
index 2b2fb438..003dea78 100644
--- a/src/components/settings/profile-form.tsx
+++ b/src/components/settings/profile-form.tsx
@@ -18,7 +18,7 @@ const profileSchema = z.object({
   name: z.string().min(1, "Name is required").max(100),
   username: z
     .string()
-    .min(3, "Username must be at least 3 characters")
+    .min(1, "Username is required")
     .max(30)
     .regex(/^[a-zA-Z0-9_]+$/, "Username can only contain letters, numbers, and underscores"),
   avatar: z.string().url().optional().or(z.literal("")),