diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 8d8a8d6277..3942a1b726 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -46,7 +46,6 @@ class acp_board
 
 						'legend2'				=> 'WARNINGS',
 						'warnings_expire_days'	=> array('lang' => 'WARNINGS_EXPIRE',		'type' => 'text:3:4', 'explain' => true),
-//						'max_warnings'
 					)
 				);
 			break;
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 7e0601d1dc..65860a48d6 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -581,14 +581,11 @@ class acp_users
 					$data['username'] = $data['user'];
 					unset($data['user']);
 
-					/**
-					* @todo $config['max_warnings'] does not exist yet
-					*/
 					// Validation data
 					$var_ary = array(
 						'password_confirm'	=> array('string', true, $config['min_pass_chars'], $config['max_pass_chars']),
 						'user_password'		=> array('string', true, $config['min_pass_chars'], $config['max_pass_chars']),
-						'warnings'			=> array('num', 0, $config['max_warnings']),
+						'warnings'			=> array('num'),
 					);
 
 					// Check username if altered