diff --git a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs
index 0c30105b..ea1a0338 100644
--- a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs
+++ b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs
@@ -482,7 +482,7 @@ public class UserService : IUserService
             return default;
         }
 
-        if (record.VerificationCode != model.VerificationCode || DateTime.UtcNow > record.VerificationCodeExpireAt)
+        if (record.VerificationCode != model.VerificationCode || (record.VerificationCodeExpireAt != null && DateTime.UtcNow > record.VerificationCodeExpireAt))
         {
             return default;
         }
@@ -669,7 +669,7 @@ public class UserService : IUserService
             return false;
         }
 
-        if (user.VerificationCode != record.VerificationCode || DateTime.UtcNow > record.VerificationCodeExpireAt)
+        if (user.VerificationCode != record.VerificationCode || (record.VerificationCodeExpireAt != null && DateTime.UtcNow > record.VerificationCodeExpireAt))
         {
             return false;
         }