diff --git a/phpBB/phpbb/profilefields/type/type_string_common.php b/phpBB/phpbb/profilefields/type/type_string_common.php
index c2b951b6c9..0eaf7e527d 100644
--- a/phpBB/phpbb/profilefields/type/type_string_common.php
+++ b/phpBB/phpbb/profilefields/type/type_string_common.php
@@ -98,7 +98,7 @@ abstract class type_string_common extends type_base
 	*/
 	public function get_profile_value($field_value, $field_data)
 	{
-		if (!$field_value && !$field_data['field_show_novalue'])
+		if (($field_value === null || $field_value === '') && !$field_data['field_show_novalue'])
 		{
 			return null;
 		}
@@ -114,7 +114,7 @@ abstract class type_string_common extends type_base
 	*/
 	public function get_profile_value_raw($field_value, $field_data)
 	{
-		if (!$field_value && !$field_data['field_show_novalue'])
+		if (($field_value === null || $field_value === '') && !$field_data['field_show_novalue'])
 		{
 			return null;
 		}
@@ -127,12 +127,7 @@ abstract class type_string_common extends type_base
 	*/
 	public function get_profile_contact_value($field_value, $field_data)
 	{
-		if (!$field_value && !$field_data['field_show_novalue'])
-		{
-			return null;
-		}
-
-		return $field_value;
+		return $this->get_profile_value_raw($field_value, $field_data);
 	}
 
 	/**
diff --git a/tests/profilefields/type_string_test.php b/tests/profilefields/type_string_test.php
index f6c14ee38b..2277526758 100644
--- a/tests/profilefields/type_string_test.php
+++ b/tests/profilefields/type_string_test.php
@@ -249,8 +249,14 @@ class phpbb_profilefield_type_string_test extends phpbb_test_case
 			array(
 				0,
 				array('field_show_novalue' => false),
-				null,
-				'Field should return null for empty integer without show_novalue',
+				0,
+				'Field should return value of integer 0 without show_novalue',
+			),
+			array(
+				'0',
+				array('field_show_novalue' => false),
+				'0',
+				'Field should return string 0',
 			),
 			array(
 				0,