diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 395a2d7c7f..27c4c7e9ef 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -79,7 +79,7 @@ $lang = array_merge($lang, array(
 	'ACL_U_SAVEDRAFTS'	=> 'Can save drafts',
 	'ACL_U_CHGCENSORS'	=> 'Can disable word censors',
 	'ACL_U_SIG'			=> 'Can use signature',
-	'ACL_U_EMOJI'		=> 'Can use emoji and rich text characters in topic title<br /><em>This setting also affects profile fields.</em>',
+	'ACL_U_EMOJI'		=> 'Can use emoji and rich text characters in topic title<br><em>This setting also affects profile fields.</em>',
 
 	'ACL_U_SENDPM'		=> 'Can send private messages',
 	'ACL_U_MASSPM'		=> 'Can send private messages to multiple users',
diff --git a/phpBB/phpbb/profilefields/type/type_string.php b/phpBB/phpbb/profilefields/type/type_string.php
index 289d78228a..382f66c12a 100644
--- a/phpBB/phpbb/profilefields/type/type_string.php
+++ b/phpBB/phpbb/profilefields/type/type_string.php
@@ -109,7 +109,7 @@ class type_string extends type_string_common
 	{
 		/**
 		 * Check for out-of-bounds characters that are currently
-		 * not supported by utf8_bin in MySQL if Emoji is not allowed
+		 * not supported by utf8_bin in MySQL if Emoji are not allowed
 		 */
 		if (!$this->auth->acl_get('u_emoji'))
 		{
diff --git a/phpBB/phpbb/profilefields/type/type_text.php b/phpBB/phpbb/profilefields/type/type_text.php
index a2e2167ac5..3b58d6b3e5 100644
--- a/phpBB/phpbb/profilefields/type/type_text.php
+++ b/phpBB/phpbb/profilefields/type/type_text.php
@@ -109,7 +109,7 @@ class type_text extends type_string_common
 	{
 		/**
 		 * Check for out-of-bounds characters that are currently
-		 * not supported by utf8_bin in MySQL if Emoji is not allowed
+		 * not supported by utf8_bin in MySQL if Emoji are not allowed
 		 */
 		if (!$this->auth->acl_get('u_emoji'))
 		{