diff --git a/app/api/og/post/route.tsx b/app/api/og/post/route.tsx
index 48bcbf0..1a8ba59 100644
--- a/app/api/og/post/route.tsx
+++ b/app/api/og/post/route.tsx
@@ -8,6 +8,24 @@ import { db } from "@/lib/db/client"
 import { posts } from "@/lib/db/schema"
 import { getSiteOrigin } from "@/lib/utils"
 
+async function fetchGitHubUser(username: string) {
+  const res = await fetch(`https://api.github.com/users/${username}`, {
+    headers: {
+      Accept: "application/vnd.github.v3+json",
+      ...(process.env.GITHUB_TOKEN && {
+        Authorization: `Bearer ${process.env.GITHUB_TOKEN}`,
+      }),
+    },
+  })
+  if (!res.ok) return null
+  const data = (await res.json()) as {
+    login: string
+    name: string | null
+    avatar_url: string
+  }
+  return { login: data.login, name: data.name || data.login, image: data.avatar_url }
+}
+
 const size = {
   width: 1200,
   height: 630,
@@ -48,6 +66,7 @@ export async function GET(request: NextRequest) {
         title: posts.title,
         number: posts.number,
         rootCommentId: posts.rootCommentId,
+        authorId: posts.authorId,
       })
       .from(posts)
       .where(
@@ -63,6 +82,8 @@ export async function GET(request: NextRequest) {
     geistMonoBold,
   ])
 
+  const author = post?.authorId ? await fetchGitHubUser(post.authorId) : null
+
   const title = post?.title || `Post #${postNumber}`
   const body = post?.rootCommentId
     ? await getRootCommentText(post.rootCommentId)
@@ -76,69 +97,103 @@ export async function GET(request: NextRequest) {
         display: "flex",
         flexDirection: "column",
         alignItems: "flex-start",
-        justifyContent: "flex-start",
+        justifyContent: "space-between",
         backgroundColor: "#fafafa",
         padding: 60,
-        gap: 32,
         fontFamily: "Geist Mono",
       }}
     >
       <div
         style={{
           display: "flex",
-          alignItems: "center",
-          gap: 12,
+          flexDirection: "column",
+          gap: 32,
         }}
       >
-        {/* eslint-disable-next-line @next/next/no-img-element */}
-        <img
-          alt="Forums"
-          height={40}
-          src={`${getSiteOrigin()}/icon.svg`}
-          width={40}
-        />
-        <span
+        <div
           style={{
-            fontSize: 36,
-            color: "#71717a",
+            display: "flex",
+            alignItems: "center",
+            gap: 12,
           }}
         >
-          {`${owner}/${repo}`}
-        </span>
-      </div>
-      <div
-        style={{
-          display: "flex",
-          flexDirection: "column",
-          gap: 24,
-        }}
-      >
+          {/* eslint-disable-next-line @next/next/no-img-element */}
+          <img
+            alt="Forums"
+            height={40}
+            src={`${getSiteOrigin()}/icon.svg`}
+            width={40}
+          />
+          <span
+            style={{
+              fontSize: 36,
+              color: "#71717a",
+            }}
+          >
+            {`${owner}/${repo}`}
+          </span>
+        </div>
         <div
           style={{
-            fontSize: 64,
-            fontWeight: 600,
-            color: "#09090b",
-            lineHeight: 1.2,
-            maxWidth: 1080,
+            display: "flex",
+            flexDirection: "column",
+            gap: 24,
           }}
         >
-          {title}
-        </div>
-        {body && (
           <div
             style={{
-              fontSize: 36,
-              color: "#52525b",
-              lineHeight: 1.5,
+              fontSize: 64,
+              fontWeight: 600,
+              color: "#09090b",
+              lineHeight: 1.2,
               maxWidth: 1080,
-              display: "block",
-              lineClamp: 3,
             }}
           >
-            {body}
+            {title}
           </div>
-        )}
+          {body && (
+            <div
+              style={{
+                fontSize: 36,
+                color: "#52525b",
+                lineHeight: 1.5,
+                maxWidth: 1080,
+                display: "block",
+                lineClamp: 2,
+              }}
+            >
+              {body}
+            </div>
+          )}
+        </div>
       </div>
+      {author && (
+        <div
+          style={{
+            display: "flex",
+            alignItems: "center",
+            gap: 16,
+          }}
+        >
+          {author.image && (
+            <img
+              alt={author.name || post.authorId}
+              height={48}
+              src={author.image}
+              style={{ borderRadius: 24 }}
+              width={48}
+            />
+          )}
+          <span
+            style={{
+              fontSize: 28,
+              color: "#71717a",
+            }}
+          >
+            {`@${post.authorId}`}
+          </span>
+        </div>
+      )}
     </div>,
     {
       ...size,