diff --git a/apps/server/src/media-paths.test.ts b/apps/server/src/media-paths.test.ts
index e6e8211c..d61fc6ed 100644
--- a/apps/server/src/media-paths.test.ts
+++ b/apps/server/src/media-paths.test.ts
@@ -24,8 +24,9 @@ describe('media path naming', () => {
     expect(folder).not.toMatch(/[<>:"/\\|?*]/);
   });
 
-  it('builds the author folder from display name and user ID', () => {
-    expect(buildAuthorFolder({ authorName: 'A/B', userId: '42' }, 'fallback')).toBe('A_B_42');
+  it('builds the author folder from display name and username', () => {
+    expect(buildAuthorFolder({ authorName: 'A/B', username: 'animal_kyawa_' }, 'fallback'))
+      .toBe('A_B@animal_kyawa_');
   });
 
   it.each([
diff --git a/apps/server/src/media-paths.ts b/apps/server/src/media-paths.ts
index 503c6f03..6e8c0ecf 100644
--- a/apps/server/src/media-paths.ts
+++ b/apps/server/src/media-paths.ts
@@ -33,8 +33,8 @@ export function formatPublishedDate(isoDate: string | undefined): string {
   return `${values.year}-${values.month}-${values.day}`;
 }
 
-export function buildAuthorFolder(metadata: Pick<PostMetadata, 'authorName' | 'userId'>, fallback: string): string {
-  return sanitizePathSegment(`${metadata.authorName}_${metadata.userId}`, fallback);
+export function buildAuthorFolder(metadata: Pick<PostMetadata, 'authorName' | 'username'>, fallback: string): string {
+  return sanitizePathSegment(`${metadata.authorName}@${metadata.username}`, fallback);
 }
 
 export function buildPostFolder(metadata: Pick<PostMetadata, 'publishedAt' | 'text'> | undefined, tweetId: string): string {