diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index a5a1fe3d70..93f98d613f 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -383,11 +383,11 @@ class ucp_profile
 								SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
 								WHERE user_id = ' . $user->data['user_id'];
 							$db->sql_query($sql);
-
-							// Update Custom Fields
-							$cp->update_profile_field_data($user->data['user_id'], $cp_data);
 						}
 
+						// Always update custom fields
+						$cp->update_profile_field_data($user->data['user_id'], $cp_data);
+
 						meta_refresh(3, $this->u_action);
 						$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 						trigger_error($message);