diff --git a/DynmapCore/src/main/resources/extracted/web/js/minecraft.js b/DynmapCore/src/main/resources/extracted/web/js/minecraft.js
index f71ddb11..62eca83f 100644
--- a/DynmapCore/src/main/resources/extracted/web/js/minecraft.js
+++ b/DynmapCore/src/main/resources/extracted/web/js/minecraft.js
@@ -8,9 +8,9 @@ function createMinecraftHead(player,size,completed,failed) {
 	};
 	var faceimg;
 	if(size == 'body')
-		faceimg = 'faces/body/' + player + '.png';
+		faceimg = 'faces/body/' + encodeURIComponent(player) + '.png';
 	else
-		faceimg = 'faces/' + size + 'x' + size + '/' + player + '.png';
+		faceimg = 'faces/' + size + 'x' + size + '/' + encodeURIComponent(player) + '.png';
 	
 	faceImage.src = concatURL(dynmap.options.url.markers, faceimg);
 }
@@ -57,4 +57,4 @@ function chat_encoder(message) {
 	    }
     }
     return message.text;
-}
\ No newline at end of file
+}