diff --git a/modules/trash/lang/ko.php b/modules/trash/lang/ko.php
index e1878e448..e0fc7a2c5 100644
--- a/modules/trash/lang/ko.php
+++ b/modules/trash/lang/ko.php
@@ -19,3 +19,9 @@ $lang->trasher = '삭제자';
 $lang->origin_info = '원문 정보';
 $lang->delete_info = '삭제 정보';
 $lang->cmd_restore = '복원';
+$lang->cmd_trash_setting = '휴지통 설정';
+$lang->cmd_trash_list = '휴지통 목록';
+$lang->document_force_to_move = '삭제시 휴지통으로 강제이동';
+$lang->force_to_move = '휴지통으로 강제이동';
+$lang->do_not_forceto_move = '강제이동을 하지않음';
+$lang->about_document_force_to_move = '게시글을 삭제시 휴지통으로 강제이동할지 않할지를 선택하는 옵션입니다.';
diff --git a/modules/trash/tpl/config.html b/modules/trash/tpl/config.html
index 51187a017..574ae1cc0 100644
--- a/modules/trash/tpl/config.html
+++ b/modules/trash/tpl/config.html
@@ -1 +1,25 @@
 <include target="./header.html" />
+
+<form action="{getUrl()}" method="post" class="x_form-horizontal" id="fo_trash">
+	<input type="hidden" name="module" value="trash" />
+	<input type="hidden" name="act" value="procTrashAdminConfig" />
+	<section class="section">
+		<div class="x_control-group">
+			<label class="x_control-label">{$lang->document_force_to_move}</label>
+			<div class="x_controls">
+				<label class="x_inline">
+					<input type="radio" id="trash_use_y" name="trash_use" value="Y" checked="checked"|cond="$config->trash_use == 'Y'" /> {$lang->force_to_move}
+				</label>
+				<label class="x_inline">
+					<input type="radio" id="trash_use_n" name="trash_use" value="N" checked="checked"|cond="$config->trash_use == 'N'" /> {$lang->do_not_forceto_move}
+				</label>
+				<p class="x_help-block">{$lang->about_document_force_to_move}</p>
+			</div>
+		</div>
+	</section>
+	<div class="x_clearfix btnArea">
+		<div class="x_pull-right">
+			<button class="x_btn x_btn-primary" type="submit">{$lang->cmd_registration}</button>
+		</div>
+	</div>
+</form>
diff --git a/modules/trash/tpl/header.html b/modules/trash/tpl/header.html
index bd7fd3cbc..020b6e302 100644
--- a/modules/trash/tpl/header.html
+++ b/modules/trash/tpl/header.html
@@ -1,2 +1,16 @@
 <load target="js/trash_admin.js" />
-<h3 class="xeAdmin">{$lang->cmd_trash} <span class="gray">{$lang->cmd_management}</span></h3>
+<div class="x_page-header">
+	<h1>{$lang->cmd_trash}</h1>
+</div>
+
+<div class="header4">
+	<ul class="x_nav x_nav-tabs">
+		<li class="x_active"|cond="$act=='dispTrashAdminList'"><a href="{getUrl('act','dispTrashAdminList')}">{$lang->cmd_trash_list}</a></li>
+		<li class="x_active"|cond="$act=='dispTrashAdminConfig'"><a href="{getUrl('act', 'dispTrashAdminConfig')}">{$lang->cmd_trash_setting}</a></li>
+	</ul>
+</div>
+
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+
diff --git a/modules/trash/tpl/trash_list.html b/modules/trash/tpl/trash_list.html
index 0e027b0ad..0807e73aa 100644
--- a/modules/trash/tpl/trash_list.html
+++ b/modules/trash/tpl/trash_list.html
@@ -3,12 +3,8 @@ var confirm_restore_msg = '{$lang->confirm_restore}';
 var no_text_comment = '{$lang->no_text_comment}';
 </script>
 <load target="js/trash_admin.js" />
-<div class="x_page-header">
-	<h1>{$lang->trash} <a class="x_icon-question-sign" href="./common/manual/admin/index.html#UMAN_content_trash" target="_blank">{$lang->help}</a></h1>
-</div>
-<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/trash/tpl/trash_list/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
-	<p>{$XE_VALIDATOR_MESSAGE}</p>
-</div>
+
+<include target="./header.html" />
 <form ruleset="emptyTrash" action="./" method="post">
 	<input type="hidden" name="module" value="trash" />
 	<input type="hidden" name="act" value="procTrashAdminEmptyTrash" />
diff --git a/modules/trash/trash.admin.controller.php b/modules/trash/trash.admin.controller.php
index 9789e3e65..6eab3cc60 100644
--- a/modules/trash/trash.admin.controller.php
+++ b/modules/trash/trash.admin.controller.php
@@ -235,10 +235,17 @@ class trashAdminController extends trash
 	{
 		$oTrashModel = getModel('trash');
 		$config = $oTrashModel->getConfig();
+		$oModuleController = getController('module');
 
 		$obj = Context::getRequestVars();
 
-		$this->setMessage('success_updated');
+		$config->trash_use = $obj->trash_use;
+
+		$output = $oModuleController->updateModuleConfig('trash', $config);
+		if(!$output->toBool())
+		{
+			$this->setMessage('success_updated');
+		}
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminConfig');
 		$this->setRedirectUrl($returnUrl);