diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index 7028df4b64..4ac6762140 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -38,13 +38,13 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	* @type string
 	*/
 	protected $phpbb_root_path;
-	
+
 	/**
 	* Current $phpEx
 	* @type string
 	*/
 	protected $phpEx;
-	
+
 	/**
 	* A cache driver
 	* @type phpbb_cache_driver_interface
@@ -99,7 +99,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	/**
 	* @inheritdoc
 	**/
-	public function prepare_form($template, $row, &$error, &$override_focus)
+	public function prepare_form($template, $row, &$error)
 	{
 		return false;
 	}
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index 8c8a067d13..d3b764e275 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -46,7 +46,7 @@ interface phpbb_avatar_driver_interface
 	/**
 	* @TODO
 	**/
-	public function prepare_form($template, $row, &$error, &$override_focus);
+	public function prepare_form($template, $row, &$error);
 
 	/**
 	* @TODO
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 27e451c099..a0ef912eae 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -43,7 +43,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 			);
 		}
 	}
-	
+
 	/**
 	* @inheritdoc
 	*/
@@ -103,7 +103,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 
 		return true;
 	}
-	
+
 	/**
 	* @inheritdoc
 	*/
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index c7d2b870c1..d9504c04a0 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -58,7 +58,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 			'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false,
 			'AV_UPLOAD_SIZE' => $this->config['avatar_filesize'],
 		));
-		
+
 		return true;
 	}