diff --git a/modules/blog/blog.controller.php b/modules/blog/blog.controller.php
index 52c1a6e1f..b019f370e 100644
--- a/modules/blog/blog.controller.php
+++ b/modules/blog/blog.controller.php
@@ -120,7 +120,7 @@
             // comment_srl이 있으면 수정으로
             } else {
                 $obj->parent_srl = $comment->parent_srl;
-                $output = $oCommentController->updateComment($obj);
+                $output = $oCommentController->updateComment($obj, $this->grant->manager);
                 $comment_srl = $obj->comment_srl;
             }
 
diff --git a/modules/blog/skins/default/comment.html b/modules/blog/skins/default/comment.html
index 5d7a89e74..d6eae8b0c 100644
--- a/modules/blog/skins/default/comment.html
+++ b/modules/blog/skins/default/comment.html
@@ -43,8 +43,7 @@
             <tr>
                 <td colspan="2">
                     <a href="{getUrl('act','dispBlogReplyComment','comment_srl',$val->comment_srl,'document_srl',$document->document_srl)}">[{$lang->cmd_reply}]</a>
-
-                    <!--@if($val->is_granted)-->
+                    <!--@if($val->is_granted || !$val->member_srl || $grant->is_admin)-->
                     <a href="{getUrl('act','dispBlogModifyComment','comment_srl',$val->comment_srl)}">[{$lang->cmd_modify}]</a>
                     <a href="{getUrl('act','dispBlogDeleteComment','comment_srl',$val->comment_srl)}">[{$lang->cmd_delete}]</a>
                     <!--@end-->
diff --git a/modules/blog/skins/default/comment_form.html b/modules/blog/skins/default/comment_form.html
index b223a2588..e0de18047 100644
--- a/modules/blog/skins/default/comment_form.html
+++ b/modules/blog/skins/default/comment_form.html
@@ -1,7 +1,7 @@
 <!--%import("filter/insert_comment.xml")-->
 <!--%import("js/blog.js")-->
 
-<!--@if($source_comment)-->
+<!--@if($source_comment || $comment)-->
     <!--#include("header.html")-->
 <!--@end-->
 
diff --git a/modules/blog/skins/xe_blog/comment.html b/modules/blog/skins/xe_blog/comment.html
index 048ab2236..8e838bb94 100644
--- a/modules/blog/skins/xe_blog/comment.html
+++ b/modules/blog/skins/xe_blog/comment.html
@@ -15,7 +15,7 @@
             <div class="member_{$val->member_srl} author">{htmlspecialchars($val->nick_name)}</div>
 
             <div class="replyOption">
-                <!--@if($val->is_granted || !$val->member_srl)-->
+                <!--@if($val->is_granted || !$val->member_srl || $grant->is_admin)-->
                     <a href="{getUrl('act','dispBlogDeleteComment','comment_srl',$val->comment_srl)}"><img src="./images/{$module_info->colorset}/buttonDeleteX.gif" alt="{$lang->cmd_reply}" width="12" height="13" /></a>
                     <a href="{getUrl('act','dispBlogModifyComment','comment_srl',$val->comment_srl)}"><img src="./images/{$module_info->colorset}/buttonModifyE.gif" alt="{$lang->cmd_modify}" width="20" height="18" /></a> 
                 <!--@end-->
diff --git a/modules/blog/skins/xe_blog/comment_form.html b/modules/blog/skins/xe_blog/comment_form.html
index 1cc5c6c27..2aeaeb4a5 100644
--- a/modules/blog/skins/xe_blog/comment_form.html
+++ b/modules/blog/skins/xe_blog/comment_form.html
@@ -1,3 +1,4 @@
+<!--%import("filter/insert_comment.xml")-->
 <!--%import("js/blog.js")-->
 
 <!--@if($source_comment || $comment)-->
diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php
index e6b24d611..45d9d2313 100644
--- a/modules/board/board.controller.php
+++ b/modules/board/board.controller.php
@@ -131,7 +131,7 @@
             // comment_srl이 있으면 수정으로
             } else {
                 $obj->parent_srl = $comment->parent_srl;
-                $output = $oCommentController->updateComment($obj);
+                $output = $oCommentController->updateComment($obj, $this->grant->manager);
                 $comment_srl = $obj->comment_srl;
             }
 
diff --git a/modules/board/skins/default/comment.html b/modules/board/skins/default/comment.html
index e754ce0be..305d0ea16 100644
--- a/modules/board/skins/default/comment.html
+++ b/modules/board/skins/default/comment.html
@@ -54,7 +54,7 @@
                 <td colspan="2">
                     <a href="{getUrl('act','dispBoardReplyComment','comment_srl',$val->comment_srl)}">[{$lang->cmd_reply}]</a>
 
-                    <!--@if($val->is_granted || !$val->member_srl)-->
+                    <!--@if($val->is_granted || !$val->member_srl || $grant->is_admin)-->
                     <a href="{getUrl('act','dispBoardModifyComment','comment_srl',$val->comment_srl)}">[{$lang->cmd_modify}]</a>
                     <a href="{getUrl('act','dispBoardDeleteComment','comment_srl',$val->comment_srl)}">[{$lang->cmd_delete}]</a>
                     <!--@end-->
diff --git a/modules/board/skins/xe_list/comment.html b/modules/board/skins/xe_list/comment.html
index c97664418..b8f28cacd 100644
--- a/modules/board/skins/xe_list/comment.html
+++ b/modules/board/skins/xe_list/comment.html
@@ -13,7 +13,7 @@
             <div class="member_{$val->member_srl} author">{htmlspecialchars($val->nick_name)}</div>
 
             <div class="replyOption">
-                <!--@if($val->is_granted || !$val->member_srl)-->
+                <!--@if($val->is_granted || !$val->member_srl || $grant->is_admin)-->
                     <a href="{getUrl('act','dispBoardDeleteComment','comment_srl',$val->comment_srl)}"><img src="./images/{$module_info->colorset}/buttonDeleteX.gif" alt="{$lang->cmd_reply}" width="12" height="13" /></a>
                     <a href="{getUrl('act','dispBoardModifyComment','comment_srl',$val->comment_srl)}"><img src="./images/{$module_info->colorset}/buttonModifyE.gif" alt="{$lang->cmd_modify}" width="20" height="18" /></a> 
                 <!--@end-->