diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 42cb434ad3..167642e5cb 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -123,27 +123,6 @@
 	</div>
 	<!-- END avatar_drivers -->
 	</div>
-	<script type="text/javascript">
-		// <![CDATA[
-			function avatar_simplify() {
-				var node = document.getElementById('av_options');
-				for (var i = 0; i < node.children.length; i++) {
-					child = node.children[i];
-					child.style.display = 'none';
-				}
-
-				var selected = document.getElementById('avatar_driver').value;
-				var id = 'av_option_' + selected;
-				node = document.getElementById(id);
-				if (node != null) {
-					node.style.display = 'block';
-				}
-			}
-
-			avatar_simplify();
-			document.getElementById('avatar_driver').onchange = avatar_simplify;
-		// ]]>
-	</script>
 	</fieldset>
 
 	<fieldset class="submit-buttons">
@@ -154,6 +133,8 @@
 	</fieldset>
 	</form>
 
+	<!-- INCLUDEJS avatars.js -->
+
 <!-- ELSEIF S_LIST -->
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 6316ff4a22..9649fa923e 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -28,30 +28,11 @@
 		<!-- END avatar_drivers -->
 		</div>
 	</fieldset>
-	<script type="text/javascript">
-		// <![CDATA[
-			function avatar_simplify() {
-				var node = document.getElementById('av_options');
-				for (var i = 0; i < node.children.length; i++) {
-					child = node.children[i];
-					child.style.display = 'none';
-				}
-
-				var selected = document.getElementById('avatar_driver').value;
-				var id = 'av_option_' + selected;
-				node = document.getElementById(id);
-				if (node != null) {
-					node.style.display = 'block';
-				}
-			}
-
-			avatar_simplify();
-			document.getElementById('avatar_driver').onchange = avatar_simplify;
-		// ]]>
-	</script>
 
 	<fieldset class="quick">
 		<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
 	</fieldset>
 	{S_FORM_TOKEN}
 	</form>
+
+	<!-- INCLUDEJS avatars.js -->
diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
new file mode 100644
index 0000000000..baa2623ac9
--- /dev/null
+++ b/phpBB/adm/style/avatars.js
@@ -0,0 +1,17 @@
+function avatar_simplify() {
+    var node = document.getElementById('av_options');
+    for (var i = 0; i < node.children.length; i++) {
+        child = node.children[i];
+        child.style.display = 'none';
+    }
+
+    var selected = document.getElementById('avatar_driver').value;
+    var id = 'av_option_' + selected;
+    node = document.getElementById(id);
+    if (node != null) {
+        node.style.display = 'block';
+    }
+}
+
+avatar_simplify();
+document.getElementById('avatar_driver').onchange = avatar_simplify;
diff --git a/phpBB/styles/prosilver/template/avatars.js b/phpBB/styles/prosilver/template/avatars.js
new file mode 100644
index 0000000000..baa2623ac9
--- /dev/null
+++ b/phpBB/styles/prosilver/template/avatars.js
@@ -0,0 +1,17 @@
+function avatar_simplify() {
+    var node = document.getElementById('av_options');
+    for (var i = 0; i < node.children.length; i++) {
+        child = node.children[i];
+        child.style.display = 'none';
+    }
+
+    var selected = document.getElementById('avatar_driver').value;
+    var id = 'av_option_' + selected;
+    node = document.getElementById(id);
+    if (node != null) {
+        node.style.display = 'block';
+    }
+}
+
+avatar_simplify();
+document.getElementById('avatar_driver').onchange = avatar_simplify;
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index a246b00ddd..2438deefd5 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -41,27 +41,7 @@
 		<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
 	</fieldset>
 
-	<script type="text/javascript">
-		// <![CDATA[
-			function avatar_simplify() {
-				var node = document.getElementById('av_options');
-				for (var i = 0; i < node.children.length; i++) {
-					child = node.children[i];
-					child.style.display = 'none';
-				}
-
-				var selected = document.getElementById('avatar_driver').value;
-				var id = 'av_option_' + selected;
-				node = document.getElementById(id);
-				if (node != null) {
-					node.style.display = 'block';
-				}
-			}
-
-			avatar_simplify();
-			document.getElementById('avatar_driver').onchange = avatar_simplify;
-		// ]]>
-	</script>
-
 	</div>
 </div>
+
+<!-- INCLUDEJS template/avatars.js -->