diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index f9846ea7cd..6049673e0a 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -117,7 +117,7 @@
 	<dl>
 		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
 		<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
-			<option value="">{L_NO_AVATAR_CATEGORY}</option>
+			<option value="">{L_NO_AVATAR}</option>
 			<!-- BEGIN avatar_drivers -->
 			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
 			<!-- END avatar_drivers -->
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 0d06d088e8..8ad4ad710b 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -14,7 +14,7 @@
 		<dl>
 			<dt><label>{L_AVATAR_TYPE}</label></dt>
 			<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
-				<option value="">{L_NO_AVATAR_CATEGORY}</option>
+				<option value="">{L_NO_AVATAR}</option>
 				<!-- BEGIN avatar_drivers -->
 				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
 				<!-- END avatar_drivers -->
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index d4e1915076..c4328aa3a6 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -359,6 +359,7 @@ $lang = array_merge($lang, array(
 	),
 	'NO_ACTION_MODE'				=> 'No message action specified.',
 	'NO_AUTHOR'						=> 'No author defined for this message',
+	'NO_AVATAR'						=> 'No avatar selected',
 	'NO_AVATAR_CATEGORY'			=> 'None',
 
 	'NO_AUTH_DELETE_MESSAGE'		=> 'You are not authorised to delete private messages.',
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index 4b4581a59c..ca077fdf5b 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -17,7 +17,7 @@
 		<dl>
 			<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
 			<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
-				<option value="">{L_NO_AVATAR_CATEGORY}</option>
+				<option value="">{L_NO_AVATAR}</option>
 				<!-- BEGIN avatar_drivers -->
 				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
 				<!-- END avatar_drivers -->
diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
index 3099fcb1d8..55c1c20528 100644
--- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html
+++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
@@ -78,7 +78,7 @@
 		<td class="row1" width="35%"><b class="genmed">{L_AVATAR_TYPE}{L_COLON}</b></td>
 		<td class="row2">
 			<select name="avatar_driver" id="avatar_driver">
-				<option value="">{L_NO_AVATAR_CATEGORY}</option>
+				<option value="">{L_NO_AVATAR}</option>
 				<!-- BEGIN avatar_drivers -->
 				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
 				<!-- END avatar_drivers -->
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
index 07b3edb498..fc52c149c6 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
@@ -28,7 +28,7 @@
 		<td class="row1" width="35%"><b class="genmed">{L_AVATAR_TYPE}{L_COLON}</b></td>
 		<td class="row2">
 			<select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
-				<option value="">{L_NO_AVATAR_CATEGORY}</option>
+				<option value="">{L_NO_AVATAR}</option>
 				<!-- BEGIN avatar_drivers -->
 				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting=".avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
 				<!-- END avatar_drivers -->