diff --git a/js/chat.js b/js/chat.js
index 8a3c2d6..1a2fdd5 100644
--- a/js/chat.js
+++ b/js/chat.js
@@ -21,6 +21,8 @@ function ChatController( $scope, rconService, $timeout )
 	$scope.OnMessage = function( msg )
 	{
 		msg.Message = stripHtml(msg.Message);
+		msg.Username = stripHtml(msg.Username);
+		
 		$scope.Output.push( msg );
 		
 		if($scope.isOnBottom()) {
@@ -79,10 +81,7 @@ function ChatController( $scope, rconService, $timeout )
 	rconService.InstallService( $scope, $scope.GetHistory )
 }
 
-function stripHtml(html)
+function stripHtml( text )
 {
-	if (html == null) return "";
-	var tmp = document.createElement("div");
-	tmp.innerHTML = html;
-	return tmp.textContent || tmp.innerText || "";
+	return text ? String(text).replace( /<[^>]+>/gm, '' ) : '';
 }
\ No newline at end of file
diff --git a/js/console.js b/js/console.js
index af065a3..2acd395 100644
--- a/js/console.js
+++ b/js/console.js
@@ -134,6 +134,8 @@ function ConsoleController( $scope, rconService, $timeout )
 	$scope.addOutput = function (msg)
 	{
 		msg.Class = msg.Type;
+		msg.Message = stripHtml(msg.Message);
+
 		$scope.Output.push( msg );
 
 		if($scope.isOnBottom()) {