diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 9c60436de8..f126d69300 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -177,6 +177,17 @@ class phpbb_avatar_manager
 		$keys = array_keys($row);
 		$values = array_values($row);
 
+		// Upon creation of a user/group $row might be empty
+		if (empty($keys))
+		{
+			return array(
+				'avatar'		=> '',
+				'avatar_type'	=> '',
+				'avatar_width'	=> '',
+				'avatar_height'	=> '',
+			);
+		}
+
 		$keys = array_map(array('phpbb_avatar_manager', 'strip_prefix'), $keys);
 
 		return array_combine($keys, $values);