diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index 20671342e8..1dcabfc1f1 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -1217,25 +1217,35 @@ class acp_profile
 			$where_sql[] = $key . ' = ' . ((is_string($value)) ? "'" . $db->sql_escape($value) . "'" : (int) $value);
 		}
 
+		if (!sizeof($where_sql))
+		{
+			return;
+		}
+
 		$sql = "SELECT $check_key 
 			FROM $table
 			WHERE " . implode(' AND ', $where_sql);
 		$result = $db->sql_query($sql);
-	
-		if (!$db->sql_fetchrow($result))
-		{
-			$db->sql_freeresult($result);
+		$row = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
 
+		if (!$row)
+		{
 			$sql_ary = array_merge($where_fields, $sql_ary);
-			$db->sql_query("INSERT INTO $table " . $db->sql_build_array('INSERT', $sql_ary));
+			
+			if (sizeof($sql_ary))
+			{
+				$db->sql_query("INSERT INTO $table " . $db->sql_build_array('INSERT', $sql_ary));
+			}
 		}
 		else
 		{
-			$db->sql_freeresult($result);
-	
-			$sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql_ary) . ' 
-				WHERE ' . implode(' AND ', $where_sql);
-			$db->sql_query($sql);
+			if (sizeof($sql_ary))
+			{
+				$sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql_ary) . ' 
+					WHERE ' . implode(' AND ', $where_sql);
+				$db->sql_query($sql);
+			}
 		}
 	}
 }
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index c273a4de14..1dfbb4f516 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -678,10 +678,13 @@ class acp_users
 							add_log('user', $user_id, 'LOG_USER_NEW_PASSWORD', $user_row['username']);
 						}
 
-						$sql = 'UPDATE ' . USERS_TABLE . '
-							SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
-							WHERE user_id = ' . $user_id;
-						$db->sql_query($sql);
+						if (sizeof($sql_ary))
+						{
+							$sql = 'UPDATE ' . USERS_TABLE . '
+								SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+								WHERE user_id = ' . $user_id;
+							$db->sql_query($sql);
+						}
 
 						/**
 						* @todo adjust every data based in the number of user warnings
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 09d4f37d64..a9327bcde0 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -179,10 +179,13 @@ class ucp_profile
 							);
 						}
 
-						$sql = 'UPDATE ' . USERS_TABLE . '
-							SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
-							WHERE user_id = ' . $user->data['user_id'];
-						$db->sql_query($sql);
+						if (sizeof($sql_ary))
+						{
+							$sql = 'UPDATE ' . USERS_TABLE . '
+								SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+								WHERE user_id = ' . $user->data['user_id'];
+							$db->sql_query($sql);
+						}
 
 						// Need to update config, forum, topic, posting, messages, etc.
 						if ($username != $user->data['username'] && $auth->acl_get('u_chgname') && $config['allow_namechange'])