diff --git a/Application/Application.csproj b/Application/Application.csproj
index d21014ece..df8389eb9 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.8.2</Version>
+    <Version>2.2.8.3</Version>
     <Authors>RaidMax</Authors>
     <Company>Forever None</Company>
     <Product>IW4MAdmin</Product>
@@ -34,8 +34,8 @@
     <ServerGarbageCollection>false</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <TieredCompilation>true</TieredCompilation>
-    <AssemblyVersion>2.2.8.2</AssemblyVersion>
-    <FileVersion>2.2.8.2</FileVersion>
+    <AssemblyVersion>2.2.8.3</AssemblyVersion>
+    <FileVersion>2.2.8.3</FileVersion>
     <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 
diff --git a/SharedLibraryCore/PartialEntities/EFClient.cs b/SharedLibraryCore/PartialEntities/EFClient.cs
index 569ea1c74..0175753d5 100644
--- a/SharedLibraryCore/PartialEntities/EFClient.cs
+++ b/SharedLibraryCore/PartialEntities/EFClient.cs
@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
@@ -453,7 +454,8 @@ namespace SharedLibraryCore.Database.Models
             LastConnection = DateTime.UtcNow;
             Connections += 1;
 
-            if (Name.Length < 3)
+            string strippedName = Name.StripColors();
+            if (string.IsNullOrWhiteSpace(Name) || strippedName.Replace(" ", "").Length < 3)
             {
                 CurrentServer.Logger.WriteDebug($"Kicking {this} because their name is too short");
                 Kick(loc["SERVER_KICK_MINNAME"], Utilities.IW4MAdminClient(CurrentServer));