diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 9c60436de8..58d994c3c0 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -45,6 +45,17 @@ class phpbb_avatar_manager
 	*/
 	protected $container;
 
+	/**
+	* Default avatar data row
+	* @var array
+	*/
+	static protected $default_row = array(
+		'avatar'		=> '',
+		'avatar_type'	=> '',
+		'avatar_width'	=> '',
+		'avatar_height'	=> '',
+	);
+
 	/**
 	* Construct an avatar manager object
 	*
@@ -174,6 +185,12 @@ class phpbb_avatar_manager
 	*/
 	static public function clean_row($row)
 	{
+		// Upon creation of a user/group $row might be empty
+		if (empty($row))
+		{
+			return self::$default_row;
+		}
+
 		$keys = array_keys($row);
 		$values = array_values($row);
 
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
index f01ea47c25..cb895b521a 100644
--- a/tests/avatar/manager_test.php
+++ b/tests/avatar/manager_test.php
@@ -1,90 +1,160 @@
-<?php
-/**
-*
-* @package testing
-* @version $Id$
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-require_once dirname(__FILE__) . '/driver/foobar.php';
-
-class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
-{
-	public function setUp()
-	{
-		global $phpbb_root_path, $phpEx;
-
-		// Mock phpbb_container
-		$this->phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
-		$this->phpbb_container->expects($this->any())
-			->method('get')
-			->with('avatar.driver.foobar')->will($this->returnValue('avatar.driver.foobar'));
-
-		// Prepare dependencies for avatar manager and driver
-		$config = new phpbb_config(array());
-		$request = $this->getMock('phpbb_request');
-		$cache = $this->getMock('phpbb_cache_driver_interface');
-
-		$this->avatar_foobar = $this->getMock('phpbb_avatar_driver_foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache));
-		$this->avatar_foobar->expects($this->any())
-            ->method('get_name')
-            ->will($this->returnValue('avatar.driver.foobar'));
-		$this->avatar_barfoo = $this->getMock('phpbb_avatar_driver_barfoo', array('get_name'));
-		$this->avatar_barfoo->expects($this->any())
-            ->method('get_name')
-            ->will($this->returnValue('avatar.driver.barfoo'));
-
-		$avatar_drivers = array($this->avatar_foobar, $this->avatar_barfoo);
-
-		$config['allow_avatar_' . get_class($this->avatar_foobar)] = true;
-		$config['allow_avatar_' . get_class($this->avatar_barfoo)] = false;
-
-		// Set up avatar manager
-		$this->manager = new phpbb_avatar_manager($config, $avatar_drivers, $this->phpbb_container);
-	}
-
-	public function test_get_driver()
-	{
-		$driver = $this->manager->get_driver('avatar.driver.foobar', false);
-		$this->assertEquals('avatar.driver.foobar', $driver);
-
-		$driver = $this->manager->get_driver('avatar.driver.foo_wrong', false);
-		$this->assertNull($driver);
-
-		$driver = $this->manager->get_driver('avatar.driver.foobar');
-		$this->assertEquals('avatar.driver.foobar', $driver);
-
-		$driver = $this->manager->get_driver('avatar.driver.foo_wrong');
-		$this->assertNull($driver);
-	}
-
-	public function test_get_all_drivers()
-	{
-		$drivers = $this->manager->get_all_drivers();
-		$this->assertArrayHasKey('avatar.driver.foobar', $drivers);
-		$this->assertArrayHasKey('avatar.driver.barfoo', $drivers);
-		$this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']);
-		$this->assertEquals('avatar.driver.barfoo', $drivers['avatar.driver.barfoo']);
-	}
-
-	public function test_get_enabled_drivers()
-	{
-		$drivers = $this->manager->get_enabled_drivers();
-		$this->assertArrayHasKey('avatar.driver.foobar', $drivers);
-		$this->assertArrayNotHasKey('avatar.driver.barfoo', $drivers);
-		$this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']);
-	}
-
-	public function test_get_avatar_settings()
-	{
-		$avatar_settings = $this->manager->get_avatar_settings($this->avatar_foobar);
-
-		$expected_settings = array(
-			'allow_avatar_' . get_class($this->avatar_foobar)	=> array('lang' => 'ALLOW_' . strtoupper(get_class($this->avatar_foobar)), 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
-		);
-
-		$this->assertEquals($expected_settings, $avatar_settings);
-	}
-}
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/driver/foobar.php';
+
+class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
+{
+	public function setUp()
+	{
+		global $phpbb_root_path, $phpEx;
+
+		// Mock phpbb_container
+		$this->phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+		$this->phpbb_container->expects($this->any())
+			->method('get')
+			->with('avatar.driver.foobar')->will($this->returnValue('avatar.driver.foobar'));
+
+		// Prepare dependencies for avatar manager and driver
+		$config = new phpbb_config(array());
+		$request = $this->getMock('phpbb_request');
+		$cache = $this->getMock('phpbb_cache_driver_interface');
+
+		$this->avatar_foobar = $this->getMock('phpbb_avatar_driver_foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache));
+		$this->avatar_foobar->expects($this->any())
+            ->method('get_name')
+            ->will($this->returnValue('avatar.driver.foobar'));
+		$this->avatar_barfoo = $this->getMock('phpbb_avatar_driver_barfoo', array('get_name'));
+		$this->avatar_barfoo->expects($this->any())
+            ->method('get_name')
+            ->will($this->returnValue('avatar.driver.barfoo'));
+
+		$avatar_drivers = array($this->avatar_foobar, $this->avatar_barfoo);
+
+		$config['allow_avatar_' . get_class($this->avatar_foobar)] = true;
+		$config['allow_avatar_' . get_class($this->avatar_barfoo)] = false;
+
+		// Set up avatar manager
+		$this->manager = new phpbb_avatar_manager($config, $avatar_drivers, $this->phpbb_container);
+	}
+
+	public function test_get_driver()
+	{
+		$driver = $this->manager->get_driver('avatar.driver.foobar', false);
+		$this->assertEquals('avatar.driver.foobar', $driver);
+
+		$driver = $this->manager->get_driver('avatar.driver.foo_wrong', false);
+		$this->assertNull($driver);
+
+		$driver = $this->manager->get_driver('avatar.driver.foobar');
+		$this->assertEquals('avatar.driver.foobar', $driver);
+
+		$driver = $this->manager->get_driver('avatar.driver.foo_wrong');
+		$this->assertNull($driver);
+	}
+
+	public function test_get_all_drivers()
+	{
+		$drivers = $this->manager->get_all_drivers();
+		$this->assertArrayHasKey('avatar.driver.foobar', $drivers);
+		$this->assertArrayHasKey('avatar.driver.barfoo', $drivers);
+		$this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']);
+		$this->assertEquals('avatar.driver.barfoo', $drivers['avatar.driver.barfoo']);
+	}
+
+	public function test_get_enabled_drivers()
+	{
+		$drivers = $this->manager->get_enabled_drivers();
+		$this->assertArrayHasKey('avatar.driver.foobar', $drivers);
+		$this->assertArrayNotHasKey('avatar.driver.barfoo', $drivers);
+		$this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']);
+	}
+
+	public function test_get_avatar_settings()
+	{
+		$avatar_settings = $this->manager->get_avatar_settings($this->avatar_foobar);
+
+		$expected_settings = array(
+			'allow_avatar_' . get_class($this->avatar_foobar)	=> array('lang' => 'ALLOW_' . strtoupper(get_class($this->avatar_foobar)), 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+		);
+
+		$this->assertEquals($expected_settings, $avatar_settings);
+	}
+
+	public function database_row_data()
+	{
+		return array(
+			array(
+				array(
+					'user_avatar'			=> '',
+					'user_avatar_type'		=> '',
+					'user_avatar_width'		=> '',
+					'user_avatar_height'	=> '',
+				),
+				array(
+					'avatar'			=> '',
+					'avatar_type'		=> '',
+					'avatar_width'		=> '',
+					'avatar_height'		=> '',
+				),
+			),
+			array(
+				array(
+					'group_avatar'			=> '',
+					'group_avatar_type'		=> '',
+					'group_avatar_width'	=> '',
+					'group_avatar_height'	=> '',
+				),
+				array(
+					'avatar'			=> '',
+					'avatar_type'		=> '',
+					'avatar_width'		=> '',
+					'avatar_height'		=> '',
+				),
+			),
+			array(
+				array(),
+				array(
+					'avatar'			=> '',
+					'avatar_type'		=> '',
+					'avatar_width'		=> '',
+					'avatar_height'		=> '',
+				),
+			),
+			array(
+				array(
+					'foobar_avatar'			=> '',
+					'foobar_avatar_type'	=> '',
+					'foobar_avatar_width'	=> '',
+					'foobar_avatar_height'	=> '',
+				),
+				array(
+					'foobar_avatar'			=> '',
+					'foobar_avatar_type'	=> '',
+					'foobar_avatar_width'	=> '',
+					'foobar_avatar_height'	=> '',
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider database_row_data
+	*/
+	public function test_clean_row(array $input, array $output)
+	{
+		$cleaned_row = array();
+
+		$cleaned_row = phpbb_avatar_manager::clean_row($input);
+		foreach ($output as $key => $null)
+		{
+			$this->assertArrayHasKey($key, $cleaned_row);
+		}
+	}
+}