diff --git a/class2.php b/class2.php
index 736eb7f24..d1a86cd1b 100644
--- a/class2.php
+++ b/class2.php
@@ -980,7 +980,7 @@ if(varset($pref['force_userupdate']) && USER && !isset($_E107['no_forceuserupdat
 $sql->db_Mark_Time('Start: Signup/splash/admin');
 
 
-if(($pref['membersonly_enabled'] && !isset($_E107['allow_guest'])) || ($pref['maintainance_flag'] && empty($_E107['cli'])))
+if(($pref['membersonly_enabled'] && !isset($_E107['allow_guest'])) || ($pref['maintainance_flag'] && empty($_E107['cli']) && empty($_E107['no_maintenance'])))
 {
 	//XXX move force_userupdate() also?
 	e107::getRedirect()->checkMaintenance();
diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php
index 94ed3c6ec..451c6e441 100644
--- a/e107_admin/mailout.php
+++ b/e107_admin/mailout.php
@@ -493,6 +493,8 @@ class mailout_main_ui extends e_admin_ui
 	public function beforeUpdate($new_data, $old_data, $id)
 	{
 		$ret = $this->processData($new_data);
+		
+		$ret['mail_content_status'] = MAIL_STATUS_TEMP; 
 
 		return $ret;
 	}