diff --git a/Libraries/Core/Helpers/TraderHelper.cs b/Libraries/Core/Helpers/TraderHelper.cs
index 8a2b89a4..a6f3f5f7 100644
--- a/Libraries/Core/Helpers/TraderHelper.cs
+++ b/Libraries/Core/Helpers/TraderHelper.cs
@@ -622,11 +622,11 @@ public class TraderHelper(
     /// </summary>
     /// <param name="traderEnumValue">The trader enum value to validate</param>
     /// <returns>The validated trader enum value as a string, or an empty string if invalid</returns>
-    /// TODO: THIS IS NOT DOING WHAT IT USED TOO
     public string GetValidTraderIdByEnumValue(string traderEnumValue)
     {
         var traderId = _databaseService.GetTraders();
-        var id = traderId.FirstOrDefault(x => x.Value.Base.Id == traderEnumValue).Key;
+        var id = traderId.FirstOrDefault(x => x.Value.Base.Id == traderEnumValue 
+                                              || x.Value.Base.Nickname.ToLower() == traderEnumValue.ToLower()).Key;
         return id;
     }