diff --git a/src/app/(after-login)/epigrams/[id]/edit/page.tsx b/src/app/(after-login)/epigrams/[id]/edit/page.tsx
index 418ef6a..70438c8 100644
--- a/src/app/(after-login)/epigrams/[id]/edit/page.tsx
+++ b/src/app/(after-login)/epigrams/[id]/edit/page.tsx
@@ -62,6 +62,7 @@ export default function EditEpigramPage({ params }: EditEpigramPageProps) {
         }}
         isSubmitting={isPending}
         onSubmit={handleUpdate}
+        myNickname={session?.user?.nickname || ''}
       />
     </Inner>
   );
diff --git a/src/app/(after-login)/epigrams/_components/EpigramForm.tsx b/src/app/(after-login)/epigrams/_components/EpigramForm.tsx
index 4b4b889..b203924 100644
--- a/src/app/(after-login)/epigrams/_components/EpigramForm.tsx
+++ b/src/app/(after-login)/epigrams/_components/EpigramForm.tsx
@@ -2,6 +2,7 @@
 
 import { useState, useEffect } from 'react';
 import { zodResolver } from '@hookform/resolvers/zod';
+import { useSession } from 'next-auth/react';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
 import {
@@ -23,6 +24,7 @@ interface EpigramFormProps {
   initValues?: Partial<CreateEpigramFormType>;
   onSubmit: (data: CreateEpigramFormType) => void;
   isSubmitting?: boolean;
+  myNickname?: string;
 }
 
 const singleTagSchema = z
@@ -39,6 +41,9 @@ export default function EpigramForm({
   onSubmit,
   isSubmitting = false,
 }: EpigramFormProps) {
+  const { data: session } = useSession();
+  const myNickname = session?.user?.nickname || '';
+
   const {
     reset,
     register,
@@ -51,14 +56,16 @@ export default function EpigramForm({
     resolver: zodResolver(createEpigramFormSchema),
     defaultValues: {
       content: initValues?.content || '',
-      selectedAuthor: (initValues?.author && ['본인', '알 수 없음'].includes(initValues.author)
-        ? initValues.author
-        : '직접 입력') as '직접 입력' | '본인' | '알 수 없음',
+      selectedAuthor:
+        initValues?.author === myNickname
+          ? '본인'
+          : initValues?.author && ['본인', '알 수 없음'].includes(initValues.author)
+            ? (initValues.author as '본인' | '알 수 없음')
+            : '직접 입력',
       author:
         initValues?.author && !['본인', '알 수 없음'].includes(initValues.author)
           ? initValues.author
           : null,
-
       referenceUrl: initValues?.referenceUrl ?? null,
       referenceTitle: initValues?.referenceTitle ?? null,
       tags: initValues?.tags || [],
@@ -77,7 +84,11 @@ export default function EpigramForm({
 
   const handleFormSubmit = (data: CreateEpigramFormType) => {
     const finalAuthor =
-      data.selectedAuthor === '직접 입력' ? data.author?.trim() || '' : data.selectedAuthor;
+      data.selectedAuthor === '본인'
+        ? myNickname
+        : data.selectedAuthor === '직접 입력'
+          ? data.author?.trim() || ''
+          : data.selectedAuthor;
 
     const payload: CreateEpigramFormType = {
       ...data,
diff --git a/src/app/(after-login)/epigrams/_components/detail/DetailContent.tsx b/src/app/(after-login)/epigrams/_components/detail/DetailContent.tsx
index 0b18235..ad3a115 100644
--- a/src/app/(after-login)/epigrams/_components/detail/DetailContent.tsx
+++ b/src/app/(after-login)/epigrams/_components/detail/DetailContent.tsx
@@ -5,7 +5,7 @@ type DetailContent = Pick<EpigramDetail, 'content' | 'author'>;
 export function DetailContent({ content, author }: DetailContent) {
   return (
     <>
-      <h2 className='font-iropke mb-4 text-2xl leading-relaxed break-keep md:mb-6 lg:mb-8 lg:text-3xl'>
+      <h2 className='font-iropke mb-4 text-2xl leading-relaxed break-keep whitespace-pre-wrap md:mb-6 lg:mb-8 lg:text-3xl'>
         {content}
       </h2>
       <div className='mb-8 flex justify-end lg:mb-9'>
diff --git a/src/app/(after-login)/mypage/_components/MyWritings.tsx b/src/app/(after-login)/mypage/_components/MyWritings.tsx
index 3f2cbf9..fb06e4c 100644
--- a/src/app/(after-login)/mypage/_components/MyWritings.tsx
+++ b/src/app/(after-login)/mypage/_components/MyWritings.tsx
@@ -35,8 +35,6 @@ export default function MyWritings() {
   const comments = commentData?.pages.flatMap((page) => page.list) ?? [];
   const CommentListCount = commentData?.pages?.[0]?.totalCount ?? 0;
 
-  console.log('comments', comments);
-  console.log('epigrams', epigrams);
   return (
     <Tabs>
       <TabList>