diff --git a/Lieb/Data/RaidService.cs b/Lieb/Data/RaidService.cs
index 3010715..0312a76 100644
--- a/Lieb/Data/RaidService.cs
+++ b/Lieb/Data/RaidService.cs
@@ -327,8 +327,11 @@ namespace Lieb.Data
                 return false;
             }
 
-            if (!string.IsNullOrEmpty(raid.RequiredRole) && !user.RoleAssignments.Where(a => a.LiebRole.RoleName == raid.RequiredRole).Any() || raid.FreeForAllTimeUTC.UtcDateTime > DateTimeOffset.UtcNow)
+            if (!string.IsNullOrEmpty(raid.RequiredRole) 
+                && !user.RoleAssignments.Where(a => a.LiebRole.RoleName == raid.RequiredRole).Any() 
+                && raid.FreeForAllTimeUTC.UtcDateTime > DateTimeOffset.UtcNow)
             {
+                bool userHasRole = user.RoleAssignments.Where(a => a.LiebRole.RoleName == raid.RequiredRole).Any();
                 errorMessage = $"The raid is still locked for {raid.RequiredRole}.";
                 return false;
             }
diff --git a/Lieb/Pages/Raids/RaidDetails.razor b/Lieb/Pages/Raids/RaidDetails.razor
index 11250c1..8f953e2 100644
--- a/Lieb/Pages/Raids/RaidDetails.razor
+++ b/Lieb/Pages/Raids/RaidDetails.razor
@@ -89,7 +89,7 @@
 
     protected override async Task OnInitializedAsync()
     {
-        _isRaidSignUpAllowed = _user != null && RaidService.IsRaidSignUpAllowed(_user.LiebUserId, _raid.RaidId, out string _errorMessage);
+        _isRaidSignUpAllowed = _user != null && RaidService.IsRaidSignUpAllowed(_user.LiebUserId, _raid.RaidId, out _errorMessage);
 
         _startTime = await TimeZoneService.GetLocalDateTime(_raid.StartTimeUTC);
         _endTime = await TimeZoneService.GetLocalDateTime(_raid.EndTimeUTC);
diff --git a/Lieb/Pages/Raids/RaidEdit.razor b/Lieb/Pages/Raids/RaidEdit.razor
index ed4de2a..1ee6eef 100644
--- a/Lieb/Pages/Raids/RaidEdit.razor
+++ b/Lieb/Pages/Raids/RaidEdit.razor
@@ -111,7 +111,7 @@
     }
     
     <ValidationSummary />
-    <label class="validation-message" >@_errosMessage</label>
+    <label class="validation-message" >@_errorMessage</label>
     <button type="submit">Submit</button>
 
 </EditForm>
@@ -126,7 +126,7 @@
 
     public Raid _raid;
 
-    private string _errosMessage = string.Empty;
+    private string _errorMessage = string.Empty;
 
     private DateTimeOffset _raidDate = DateTime.Now.Date;
     private DateTimeOffset _startTime;
@@ -189,7 +189,7 @@
 
         if(_raid.Roles.Count == 0)
         {
-            _errosMessage = "Roles are needed for a raid.";
+            _errorMessage = "Roles are needed for a raid.";
             return;
         }