diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index 4862d3ead0..03b1cf3b82 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -365,6 +365,12 @@ class acp_profile
 				$cp->vars['lang_explain']		= request_var('lang_explain', $field_row['lang_explain'], true);
 				$cp->vars['lang_default_value']	= request_var('lang_default_value', $field_row['lang_default_value'], true);
 				
+
+				if (strlen($cp->vars['field_ident']) > 17)
+				{
+					$error[] = $user->lang['INVALID_FIELD_IDENT_LEN'];
+				}
+				
 				// Field option...
 				if (isset($_REQUEST['field_option']))
 				{
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 6b04f315b1..58f5c5e4a6 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -586,7 +586,7 @@ if (!function_exists('realpath'))
 
 			// @todo If the file exists fine and open_basedir only has one path we should be able to prepend it
 			// because we must be inside that basedir, the question is where...
-			// @interal The slash in is_dir() gets around an open_basedir restriction
+			// @internal The slash in is_dir() gets around an open_basedir restriction
 			if (!@file_exists($resolved) || (!is_dir($resolved . '/') && !is_file($resolved)))
 			{
 				return false;
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index c0df2ae11e..dd26ea5370 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -92,6 +92,7 @@ $lang = array_merge($lang, array(
 	'HIDE_PROFILE_FIELD_EXPLAIN'	=> 'Only Administrators and Moderators are able to see/fill out this profile field. If this option is enabled, the profile field will be only displayed in user profiles.',
 
 	'INVALID_CHARS_FIELD_IDENT'	=> 'Field identification can only contain lowercase a-z and _',
+	'INVALID_FIELD_IDENT_LEN'	=> 'Field identification can only be 17 characters long',
 	'ISO_LANGUAGE'				=> 'Language [%s]',
 
 	'LANG_SPECIFIC_OPTIONS'		=> 'Language specific options [<strong>%s</strong>]',