diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index d7a733eded..d588a34cec 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -971,7 +971,7 @@ class acp_profile
 			}
 		}
 
-		$cp->vars = $profile_type->get_language_options_input($cp->vars);
+		$cp->vars = $profile_field->get_language_options_input($cp->vars);
 
 		if ($cp->vars['lang_options'])
 		{
diff --git a/phpBB/phpbb/profilefields/type/type_date.php b/phpBB/phpbb/profilefields/type/type_date.php
index f874ff33c3..335a63b3f4 100644
--- a/phpBB/phpbb/profilefields/type/type_date.php
+++ b/phpBB/phpbb/profilefields/type/type_date.php
@@ -203,7 +203,7 @@ class type_date extends type_base
 			return $this->user->create_datetime()
 				->setDate($year, $month, $day)
 				->setTime(0, 0, 0)
-				->format($user->lang['DATE_FORMAT'], true);
+				->format($this->user->lang['DATE_FORMAT'], true);
 		}
 
 		return $field_value;