diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 5391b781fa..8a5571fcce 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -456,6 +456,8 @@ class custom_profile
 
 			$user_fields = array();
 
+			$user_ids = $user_id;
+
 			// Go through the fields in correct order
 			foreach (array_keys($this->profile_cache) as $used_ident)
 			{
@@ -464,6 +466,12 @@ class custom_profile
 					$user_fields[$user_id][$used_ident]['value'] = $row['pf_' . $used_ident];
 					$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
 				}
+
+				foreach ($user_ids as $user_id)
+				{
+					$user_fields[$user_id][$used_ident]['value'] = '';
+					$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
+				}
 			}
 
 			return $user_fields;