diff --git a/inc/functions.php b/inc/functions.php
index da24951d..77e1be91 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -533,7 +533,7 @@
 		global $config;
 		// Find number of mutes in the past X hours
 		$query = prepare("SELECT COUNT(*) as `count` FROM `mutes` WHERE `time` >= :time AND `ip` = :ip");
-		$query->bindValue(':time', time()-(ROBOT_MUTE_HOUR*3600), PDO::PARAM_INT);
+		$query->bindValue(':time', time()-($config['robot_mute_hour']*3600), PDO::PARAM_INT);
 		$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 		$query->execute() or error(db_error($query));
 		
@@ -553,6 +553,8 @@
 	}
 	
 	function checkMute() {
+		global $config;
+		
 		$mutetime = muteTime();
 		if($mutetime > 0) {
 			// Find last mute time
diff --git a/post.php b/post.php
index 1f2d879f..8cf5d426 100644
--- a/post.php
+++ b/post.php
@@ -128,9 +128,9 @@
 		if(!openBoard($post['board']))
 			error($config['error']['noboard']);
 		
-		//if(ROBOT_ENABLE && $board['uri'] == ROBOT_BOARD && ROBOT_MUTE) {
-		//	checkMute();
-		//}
+		if($config['robot_enable'] && $config['robot_mute']) {
+			checkMute();
+		}
 		
 		//Check if thread exists
 		if(!$OP && !threadExists($post['thread']))
@@ -265,15 +265,13 @@
 			$post['thumbheight'] = $thumb['height'];
 		}
 		
-		/*
-		if(!($mod && $mod['type'] >= $config['mod']['postunoriginal']) && ROBOT_ENABLE && $board['uri'] == ROBOT_BOARD && checkRobot($post['body_nomarkup'])) {
-			if(ROBOT_MUTE) {
+		if(!($mod && $mod['type'] >= $config['mod']['postunoriginal']) && $config['robot_enable'] && checkRobot($post['body_nomarkup'])) {
+			if($config['robot_mute']) {
 				error(sprintf($config['error']['muted'], mute()));
 			} else {
 				error($config['error']['unoriginal']);
 			}
 		}
-		*/
 		
 		// Remove DIR_* before inserting them into the database.
 		if($post['has_file']) {