diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index b3bdcf1480..d11f7cbfeb 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1493,7 +1493,7 @@ function validate_user_email($email, $allowed_email = false)
 	$ban = $user->check_ban(false, false, $email, true);
 	if (!empty($ban))
 	{
-		return !empty($ban['ban_give_reason']) ? $ban['ban_give_reason'] : 'EMAIL_BANNED';
+		return !empty($ban['reason']) ? $ban['reason'] : 'EMAIL_BANNED';
 	}
 
 	if (!$config['allow_emailreuse'])
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index 9fd2db349a..813a156726 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -1204,7 +1204,7 @@ class session
 			}
 
 			// Determine which message to output
-			$till_date = ($ban_row['end'] > 0) ? $this->format_date($ban_row['end']) : '';
+			$till_date = ($ban_row && $ban_row['end'] > 0) ? $this->format_date($ban_row['end']) : '';
 			$message = $this->get_ban_message($ban_row, $ban_triggered_by);
 
 			$contact_link = phpbb_get_board_contact_link($config, $phpbb_root_path, $phpEx);
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php
index 52427d2915..bf4f10c15a 100644
--- a/phpBB/phpbb/user.php
+++ b/phpBB/phpbb/user.php
@@ -879,12 +879,12 @@ class user extends \phpbb\session
 	{
 		global $config, $phpbb_root_path, $phpEx;
 
-		$till_date = ($ban_row['ban_end']) ? $this->format_date($ban_row['ban_end']) : '';
-		$message = ($ban_row['ban_end']) ? 'BOARD_BAN_TIME' : 'BOARD_BAN_PERM';
+		$till_date = ($ban_row['end']) ? $this->format_date($ban_row['end']) : '';
+		$message = ($ban_row['end']) ? 'BOARD_BAN_TIME' : 'BOARD_BAN_PERM';
 
 		$contact_link = phpbb_get_board_contact_link($config, $phpbb_root_path, $phpEx);
 		$message = $this->language->lang($message, $till_date, '<a href="' . $contact_link . '">', '</a>');
-		$message .= ($ban_row['ban_give_reason']) ? '<br><br>' . $this->language->lang('BOARD_BAN_REASON', $ban_row['ban_give_reason']) : '';
+		$message .= ($ban_row['reason']) ? '<br><br>' . $this->language->lang('BOARD_BAN_REASON', $ban_row['reason']) : '';
 		$message .= '<br><br><em>' . $this->language->lang('BAN_TRIGGERED_BY_' . strtoupper($ban_triggered_by)) . '</em>';
 
 		return $message;
diff --git a/tests/functions/fixtures/validate_email.xml b/tests/functions/fixtures/validate_email.xml
index 985050cedc..4fa9bd03d0 100644
--- a/tests/functions/fixtures/validate_email.xml
+++ b/tests/functions/fixtures/validate_email.xml
@@ -1,26 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dataset>
-	<table name="phpbb_banlist">
+	<table name="phpbb_bans">
 		<column>ban_id</column>
-		<column>ban_userid</column>
-		<column>ban_exclude</column>
+		<column>ban_mode</column>
+		<column>ban_item</column>
+		<column>ban_start</column>
 		<column>ban_end</column>
-		<column>ban_email</column>
-		<column>ban_give_reason</column>
+		<column>ban_reason</column>
+		<column>ban_reason_display</column>
 		<row>
 			<value>1</value>
-			<value>0</value>
-			<value>0</value>
-			<value>0</value>
+			<value>email</value>
 			<value>banned@example.com</value>
+			<value>0</value>
+			<value>0</value>
+			<value></value>
 			<value></value>
 		</row>
 		<row>
 			<value>2</value>
-			<value>0</value>
-			<value>0</value>
-			<value>0</value>
+			<value>email</value>
 			<value>banned2@example.com</value>
+			<value>0</value>
+			<value>0</value>
+			<value>just because</value>
 			<value>just because</value>
 		</row>
 	</table>