diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 9b6e9581f1..902d4cc472 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -87,6 +87,7 @@
 	<a name="v304"></a><h3>1.i. Changes since 3.0.4</h3>
 
 	<ul>
+		<li>[Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)</li>
 		<li>[Fix] Missing read permission from calls to phpbb_chmod()</li>
 	</ul>
 
@@ -819,4 +820,4 @@
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index ea62a75306..3a3c5188bf 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -501,6 +501,11 @@ function user_delete($mode, $user_id, $post_username = false)
 
 	$cache->destroy('sql', MODERATOR_CACHE_TABLE);
 
+	// Delete the user_id from the banlist
+	$sql = 'DELETE FROM ' . BANLIST_TABLE . ' 
+		WHERE ban_userid = ' . $user_id;
+	$db->sql_query($sql);
+
 	// Remove any undelivered mails...
 	$sql = 'SELECT msg_id, user_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
@@ -3356,4 +3361,4 @@ function group_update_listings($group_id)
 	}
 }
 
-?>
\ No newline at end of file
+?>