diff --git a/js/client-chat.js b/js/client-chat.js
index 847c963c8..a8e3ae29d 100644
--- a/js/client-chat.js
+++ b/js/client-chat.js
@@ -868,9 +868,12 @@
 
 			case 'avatar':
 				var parts = target.split(',');
-				var avatar = parseInt(parts[0], 10);
+				var avatarString = toId(parts[0]);
+				var avatar = parseInt(avatarString, 10);
 				if (avatar) {
 					Tools.prefs('avatar', avatar);
+				} else if (['bw2elesa', 'teamrocket', 'yellow', 'zinnia', 'clemont'].indexOf(avatarString) > -1) { // custom avatar exceptions
+					Tools.prefs('avatar', '#' + avatarString);
 				}
 				return text; // Send the /avatar command through to the server.