diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 7313844955..770eab48d5 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1952,7 +1952,7 @@ function validate_jabber($jid)
 * @param int $style_id The style_id of a style which should be checked if activated or not.
 * @return boolean
 */
-function phpbb_validate_style($style_id)
+function phpbb_style_is_active($style_id)
 {
 	global $db;
 
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 5b915824d6..f6fe916d8b 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -65,9 +65,9 @@ class ucp_prefs
 					{
 						$data['style'] = $config['default_style'];
 					}
-					else if (!phpbb_validate_style($data['style']))
+					else if (!phpbb_style_is_active($data['style']))
 					{
-						$data['style'] = (int) $user->data['user_style']);
+						$data['style'] = (int) $user->data['user_style'];
 					}
 
 					$error = validate_data($data, array(
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 096d90219b..8f00b18846 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2030,18 +2030,18 @@ function change_database_data(&$no_updates, $version)
 		// Changes from 3.0.10 to 3.0.11-RC1
 		case '3.0.10':
 			// Updates users having current style a deactivated one
-			$deactivated_style_ids = array();
 			$sql = 'SELECT style_id
 					FROM ' . STYLES_TABLE . '
 					WHERE style_active = 0';
 			$result = $db->sql_query($sql);
 
+			$deactivated_style_ids = array();
 			while ($temp_style_id = $db->sql_fetchfield('style_id', false, $result))
 			{
 				$deactivated_style_ids[] = (int) $temp_style_id;
 			}
-
 			$db->sql_freeresult($result);
+
 			if (!empty($deactivated_style_ids))
 			{
 				$sql = 'UPDATE ' . USERS_TABLE . '
@@ -2049,6 +2049,7 @@ function change_database_data(&$no_updates, $version)
 						WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids);
 				$result = $db->sql_query($sql);
 			}
+
 			$no_updates = false;
 		break;
 	}