diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php
index 4eac5ec3d..ea7b619e6 100644
--- a/modules/board/board.controller.php
+++ b/modules/board/board.controller.php
@@ -178,14 +178,8 @@ class BoardController extends Board
 				}
 			}
 
-			// if document status is temp
-			if($oDocument->get('status') == DocumentModel::getConfigStatus('temp'))
-			{
-				// Update list order, date
-				$obj->last_update = $obj->regdate = date('YmdHis');
-				$obj->update_order = $obj->list_order = (getNextSequence() * -1);
-			}
-			else
+			// Additional protections for published (non-TEMP) documents
+			if($oDocument->get('status') !== DocumentModel::getConfigStatus('temp'))
 			{
 				// Protect document by comment
 				if($this->module_info->protect_content == 'Y' || $this->module_info->protect_update_content == 'Y')
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 507d0bbda..b97cbcf82 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -997,13 +997,25 @@ class DocumentController extends Document
 
 		// can modify regdate only manager
 		$grant = Context::get('grant');
-		if(!$grant->manager)
+		if(!$grant->manager && !$manual_updated)
 		{
 			unset($obj->regdate);
 			unset($obj->last_update);
 			unset($obj->list_order);
 		}
 
+		// Set default values for regdate, list_order, and update_order.
+		if ($is_publish)
+		{
+			$obj->regdate = date('YmdHis');
+			$obj->list_order = getNextSequence() * -1;
+			$obj->update_order = $obj->list_order;
+		}
+		else
+		{
+			$obj->update_order = getNextSequence() * -1;
+		}
+
 		// Serialize the $extra_vars
 		if (isset($obj->extra_vars) && !is_string($obj->extra_vars))
 		{
@@ -1036,9 +1048,6 @@ class DocumentController extends Document
 			}
 		}
 
-		// Change the update order
-		$obj->update_order = getNextSequence() * -1;
-
 		// Hash the password if it exists
 		if($obj->password)
 		{
@@ -1124,12 +1133,6 @@ class DocumentController extends Document
 			}
 		}
 
-		// if temporary document, regdate is now setting
-		if ($source_obj->get('status') == $this->getConfigStatus('temp'))
-		{
-			$obj->regdate = date('YmdHis');
-		}
-
 		// Insert data into the DB
 		$output = executeQuery('document.updateDocument', $obj);
 		if(!$output->toBool())