diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php
index c6923816c..1fe00a2f2 100644
--- a/modules/board/board.controller.php
+++ b/modules/board/board.controller.php
@@ -148,6 +148,12 @@ class boardController extends board
 			{
 				$oModuleModel = getModel('module');
 				$member_config = $oModuleModel->getModuleConfig('member');
+				$is_logged = Context::get('is_logged');
+
+				if(!$is_logged && !$member_config->webmaster_email)
+				{
+					$obj->email_address = $this->module_info->admin_mail;
+				}
 				
 				$oMail = new Mail();
 				$oMail->setTitle($obj->title);
diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index 7d62bce1d..314e75330 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -616,6 +616,7 @@ class commentController extends comment
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl);
 
 		$oMemberModel = getModel("member");
+		$is_logged = Context::get('is_logged');
 		if(isset($obj->member_srl) && !is_null($obj->member_srl))
 		{
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($obj->member_srl);
@@ -639,7 +640,12 @@ class commentController extends comment
 		if($module_info->admin_mail && $member_info->is_admin != 'Y')
 		{
 			$oMail = new Mail();
-			$oMail->setSender($obj->email_address, $obj->email_address);
+
+			if($is_logged)
+			{
+				$oMail->setSender($obj->email_address, $obj->email_address);
+			}
+
 			$mail_title = "[Rhymix - " . Context::get('mid') . "] A new comment was posted on document: \"" . $oDocument->getTitleText() . "\"";
 			$oMail->setTitle($mail_title);
 			$url_comment = getFullUrl('','document_srl',$obj->document_srl).'#comment_'.$obj->comment_srl;
@@ -712,7 +718,10 @@ class commentController extends comment
 				{
 					continue;
 				}
-
+				if(!$is_logged)
+				{
+					$oMail->setSender($email_address, $email_address);
+				}
 				$oMail->setReceiptor($email_address, $email_address);
 				$oMail->send();
 			}
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 2a8c8e55e..9a5bd1b40 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -316,8 +316,8 @@ class documentController extends document
 		if(!$obj->email_address) $obj->email_address = '';
 		if(!$isRestore) $obj->ipaddress = $_SERVER['REMOTE_ADDR'];
 
-                // can modify regdate only manager
-                $grant = Context::get('grant');
+		// can modify regdate only manager
+		$grant = Context::get('grant');
 		if(!$grant->manager)
 		{
 			unset($obj->regdate);