diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php
index 9335e40ff9..62033f7891 100644
--- a/phpBB/includes/acp/acp_ban.php
+++ b/phpBB/includes/acp/acp_ban.php
@@ -56,7 +56,6 @@ class acp_ban
 			$ban				= $request->variable('ban', '', true);
 			$ban_length			= $request->variable('banlength', 0);
 			$ban_length_other	= $request->variable('banlengthother', '');
-			$ban_exclude		= $request->variable('banexclude', 0);
 			$ban_reason			= $request->variable('banreason', '', true);
 			$ban_give_reason	= $request->variable('bangivereason', '', true);
 
@@ -94,7 +93,15 @@ class acp_ban
 				{
 					trigger_error($abort_ban . adm_back_link($this->u_action));
 				}
-				user_ban($mode, $ban, $ban_length, $ban_length_other, $ban_exclude, $ban_reason, $ban_give_reason);
+
+				$ban_start = new \DateTime();
+				$ban_start->setTimestamp(time());
+				$ban_end = $ban_manager->get_ban_end($user, $ban_start, $ban_length, $ban_length_other);
+
+				$ban = explode("\n", $ban);
+				$ban_manager->ban($mode, $ban, $ban_start, $ban_end, $ban_reason, $ban_give_reason);
+
+				//user_ban($mode, $ban, $ban_length, $ban_length_other, $ban_exclude, $ban_reason, $ban_give_reason);
 
 				/**
 				* Use this event to perform actions after the ban has been performed
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 04eb7d8df6..8e784ef576 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -3163,7 +3163,7 @@ function display_ban_options($mode)
 	$ban_rows = $ban_manager->get_bans($mode);
 
 	$banned_options = array();
-	foreach ($ban_rows as $row)
+	foreach ($ban_rows as $ban_row)
 	{
 		$banned_options[] = '<option value="' . $ban_row['ban_id'] . '">' . $ban_row['ban_item'] . '</option>';