diff --git a/Marsey/Game/Patches/HWID.cs b/Marsey/Game/Patches/HWID.cs
index 6404b62..7eaae03 100644
--- a/Marsey/Game/Patches/HWID.cs
+++ b/Marsey/Game/Patches/HWID.cs
@@ -44,7 +44,7 @@ public static void SetHWID(string hwid)
 
     private static string CleanHwid(string hwid)
     {
-        return new string(hwid.Where(c => "0123456789ABCDEFabcdef".Contains(c)).ToArray());
+        return new string(hwid.Where(c => "0123456789ABCDEF".Contains(c)).ToArray());
     }
 
     private static void ForceHWID(string cleanedHwid)
diff --git a/SS14.Launcher/ViewModels/MainWindowTabs/OptionsTabViewModel.cs b/SS14.Launcher/ViewModels/MainWindowTabs/OptionsTabViewModel.cs
index d0968fd..de47cf1 100644
--- a/SS14.Launcher/ViewModels/MainWindowTabs/OptionsTabViewModel.cs
+++ b/SS14.Launcher/ViewModels/MainWindowTabs/OptionsTabViewModel.cs
@@ -406,7 +406,7 @@ private void OnSetHWIdClick()
         string hwid = _HWIdString;
 
         // Check if _HWIdString is a valid hex string (allowing empty string) and pad it if necessary
-        if (Regex.IsMatch(_HWIdString, "^[a-fA-F0-9]*$")) // '*' allows for zero or more characters
+        if (Regex.IsMatch(_HWIdString, "^$|^[A-F0-9]{64}$")) // '*' allows for zero or more characters
         {
             if (LIHWIDBind)
             {