diff --git a/Application/Application.csproj b/Application/Application.csproj
index 7eca5dcb4..35cff8ac3 100644
--- a/Application/Application.csproj
+++ b/Application/Application.csproj
@@ -6,7 +6,7 @@
     <RuntimeFrameworkVersion>2.2.2</RuntimeFrameworkVersion>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PackageId>RaidMax.IW4MAdmin.Application</PackageId>
-    <Version>2.2.5.2</Version>
+    <Version>2.2.5.3</Version>
     <Authors>RaidMax</Authors>
     <Company>Forever None</Company>
     <Product>IW4MAdmin</Product>
@@ -31,8 +31,8 @@
   <PropertyGroup>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <TieredCompilation>true</TieredCompilation>
-    <AssemblyVersion>2.2.5.2</AssemblyVersion>
-    <FileVersion>2.2.5.2</FileVersion>
+    <AssemblyVersion>2.2.5.3</AssemblyVersion>
+    <FileVersion>2.2.5.3</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/SharedLibraryCore/Services/ChangeHistoryService.cs b/SharedLibraryCore/Services/ChangeHistoryService.cs
index b27a728ce..c9d737304 100644
--- a/SharedLibraryCore/Services/ChangeHistoryService.cs
+++ b/SharedLibraryCore/Services/ChangeHistoryService.cs
@@ -4,6 +4,7 @@ using SharedLibraryCore.Events;
 using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -32,6 +33,13 @@ namespace SharedLibraryCore.Services
                     };
                     break;
                 case GameEvent.EventType.Command:
+                    if (e.Extra is Command cmd)
+                    {
+                        if (cmd.Name == "login" || cmd.Name == "setpassword")
+                        {
+                            e.Message = string.Join(' ', e.Message.Split(" ").Select((arg, index) => index > 0 ? "*****" : arg));
+                        }
+                    }
                     change = new EFChangeHistory()
                     {
                         OriginEntityId = e.Origin.ClientId,