diff --git a/phpBB/phpbb/profilefields/lang_helper.php b/phpBB/phpbb/profilefields/lang_helper.php
index c055931181..2e353722b2 100644
--- a/phpBB/phpbb/profilefields/lang_helper.php
+++ b/phpBB/phpbb/profilefields/lang_helper.php
@@ -49,43 +49,50 @@ class lang_helper
 	}
 
 	/**
-	* Get language entries for options and store them here for later use
+	* Loads preview options into language entries for options
+	*
+	* @param	int		$field_id
+	* @param	int		$lang_id
+	* @param	mixed	$preview_options
 	*/
-	public function get_option_lang($field_id, $lang_id, $field_type, $preview_options)
+	public function load_preview_options($field_id, $lang_id, $preview_options)
 	{
-		if ($preview_options !== false)
-		{
-			$lang_options = (!is_array($preview_options)) ? explode("\n", $preview_options) : $preview_options;
+		$lang_options = (!is_array($preview_options)) ? explode("\n", $preview_options) : $preview_options;
 
-			foreach ($lang_options as $num => $var)
-			{
-				if (!isset($this->options_lang[$field_id]))
-				{
-					$this->options_lang[$field_id] = array();
-				}
-				if (!isset($this->options_lang[$field_id][$lang_id]))
-				{
-					$this->options_lang[$field_id][$lang_id] = array();
-				}
-				$this->options_lang[$field_id][$lang_id][($num + 1)] = $var;
-			}
-		}
-		else
+		foreach ($lang_options as $num => $var)
 		{
-			$sql = 'SELECT option_id, lang_value
+			if (!isset($this->options_lang[$field_id]))
+			{
+				$this->options_lang[$field_id] = array();
+			}
+			if (!isset($this->options_lang[$field_id][$lang_id]))
+			{
+				$this->options_lang[$field_id][$lang_id] = array();
+			}
+			$this->options_lang[$field_id][$lang_id][($num + 1)] = $var;
+		}
+	}
+
+	/**
+	* Fetches language entries for options from DB
+	*
+	* @param	int		$lang_id
+	*/
+	public function load_option_lang($lang_id)
+	{
+		$sql = 'SELECT field_id, option_id, lang_value
 				FROM ' . $this->language_table . '
-					WHERE field_id = ' . (int) $field_id . '
-					AND lang_id = ' . (int) $lang_id . "
-					AND field_type = '" . $this->db->sql_escape($field_type) . "'
+				WHERE lang_id = ' . (int) $lang_id . "
 				ORDER BY option_id";
-			$result = $this->db->sql_query($sql);
 
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$this->options_lang[$field_id][$lang_id][($row['option_id'] + 1)] = $row['lang_value'];
-			}
-			$this->db->sql_freeresult($result);
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$this->options_lang[$row['field_id']][$lang_id][($row['option_id'] + 1)] = $row['lang_value'];
 		}
+
+		$this->db->sql_freeresult($result);
 	}
 
 	/**
diff --git a/phpBB/phpbb/profilefields/type/type_bool.php b/phpBB/phpbb/profilefields/type/type_bool.php
index eb8d3e47d6..f67e58ee3a 100644
--- a/phpBB/phpbb/profilefields/type/type_bool.php
+++ b/phpBB/phpbb/profilefields/type/type_bool.php
@@ -155,7 +155,7 @@ class type_bool extends type_base
 
 		if (!$this->lang_helper->is_set($field_id, $lang_id))
 		{
-			$this->lang_helper->get_option_lang($field_id, $lang_id, FIELD_BOOL, false);
+			$this->lang_helper->load_option_lang($lang_id);
 		}
 
 		if (!$field_value && $field_data['field_show_novalue'])
@@ -203,7 +203,14 @@ class type_bool extends type_base
 		{
 			if (!$this->lang_helper->is_set($profile_row['field_id'], $profile_row['lang_id'], 1))
 			{
-				$this->lang_helper->get_option_lang($profile_row['field_id'], $profile_row['lang_id'], $this->get_service_name(), $preview_options);
+				if ($preview_options)
+				{
+					$this->lang_helper->load_preview_options($profile_row['field_id'], $profile_row['lang_id'], $preview_options);
+				}
+				else
+				{
+					$this->lang_helper->load_option_lang($profile_row['lang_id']);
+				}
 			}
 
 			$options = $this->lang_helper->get($profile_row['field_id'], $profile_row['lang_id']);
diff --git a/phpBB/phpbb/profilefields/type/type_dropdown.php b/phpBB/phpbb/profilefields/type/type_dropdown.php
index 52c9fcf86a..118ddf1f37 100644
--- a/phpBB/phpbb/profilefields/type/type_dropdown.php
+++ b/phpBB/phpbb/profilefields/type/type_dropdown.php
@@ -135,7 +135,7 @@ class type_dropdown extends type_base
 		// retrieve option lang data if necessary
 		if (!$this->lang_helper->is_set($field_data['field_id'], $field_data['lang_id'], 1))
 		{
-			$this->lang_helper->get_option_lang($field_data['field_id'], $field_data['lang_id'], $this->get_service_name(), false);
+			$this->lang_helper->load_option_lang($field_data['lang_id']);
 		}
 
 		if (!$this->lang_helper->is_set($field_data['field_id'], $field_data['lang_id'], $field_value))
@@ -160,7 +160,7 @@ class type_dropdown extends type_base
 		$lang_id = $field_data['lang_id'];
 		if (!$this->lang_helper->is_set($field_id, $lang_id))
 		{
-			$this->lang_helper->get_option_lang($field_id, $lang_id, $this->get_service_name(), false);
+			$this->lang_helper->load_option_lang($lang_id);
 		}
 
 		if ($field_value == $field_data['field_novalue'] && !$field_data['field_show_novalue'])
@@ -199,7 +199,14 @@ class type_dropdown extends type_base
 
 		if (!$this->lang_helper->is_set($profile_row['field_id'], $profile_row['lang_id'], 1))
 		{
-			$this->lang_helper->get_option_lang($profile_row['field_id'], $profile_row['lang_id'], $this->get_service_name(), $preview_options);
+			if ($preview_options)
+			{
+				$this->lang_helper->load_preview_options($profile_row['field_id'], $profile_row['lang_id'], $preview_options);
+			}
+			else
+			{
+				$this->lang_helper->load_option_lang($profile_row['lang_id']);
+			}
 		}
 
 		$profile_row['field_value'] = (int) $value;