diff --git a/Lieb/Data/RaidService.cs b/Lieb/Data/RaidService.cs
index 926019c..ec83689 100644
--- a/Lieb/Data/RaidService.cs
+++ b/Lieb/Data/RaidService.cs
@@ -394,7 +394,7 @@ namespace Lieb.Data
                 return false;
             }
 
-            foreach (ulong userId in raid.SignUps.Where(s => s.RaidRoleId == plannedRoleId && s.SignUpType == SignUpType.SignedUp).Select(s => s.LiebUserId))
+            foreach (ulong userId in raid.SignUps.Where(s => s.RaidRoleId == plannedRoleId && s.SignUpType == SignUpType.SignedUp && s.LiebUserId.HasValue).Select(s => s.LiebUserId))
             {
                 foreach (RaidSignUp signUp in raid.SignUps.Where(s => s.LiebUserId == userId && s.SignUpType == SignUpType.Flex))
                 {
diff --git a/Lieb/Pages/GuildWars2/BuildList.razor.css b/Lieb/Pages/GuildWars2/BuildList.razor.css
index 5064aa0..b375cd2 100644
--- a/Lieb/Pages/GuildWars2/BuildList.razor.css
+++ b/Lieb/Pages/GuildWars2/BuildList.razor.css
@@ -53,7 +53,6 @@ input[type=checkbox].css-checkbox + label.css-label {
     background-size: 17px;
     font-size:17px;
     vertical-align:middle;
-    cursor:pointer;
 }
 
 input[type=checkbox].css-checkbox:checked + label.css-label {
diff --git a/Lieb/Pages/Raids/RaidOverview/RaidRoles.razor b/Lieb/Pages/Raids/RaidOverview/RaidRoles.razor
index 4ef669c..1aca9f5 100644
--- a/Lieb/Pages/Raids/RaidOverview/RaidRoles.razor
+++ b/Lieb/Pages/Raids/RaidOverview/RaidRoles.razor
@@ -76,9 +76,9 @@
                 {
                     bool notIsRoleSignUpAllowed = !RaidService.IsRoleSignUpAllowed(_raid.RaidId, _liebUserId, role.Role.RaidRoleId, SignUpType.SignedUp, false);
                     bool notIsBackupAllowed = _raid.RaidType != RaidType.Planned && notIsRoleSignUpAllowed;
-                    <td><button class="raidButton" @onclick="() => SignUpClicked(role.Role, SignUpType.SignedUp)" disabled="@notIsRoleSignUpAllowed">Sign Up</button></td>
-                    <td><button class="raidButton" @onclick="() => SignUpClicked(role.Role, SignUpType.Maybe)" disabled="@notIsRoleSignUpAllowed">Maybe</button></td>
-                    <td><button class="raidButton" @onclick="() => SignUpClicked(role.Role, SignUpType.Backup)" disabled="@notIsBackupAllowed">Backup</button></td>
+                    <td><button class="raidButton" @onclick="() => SignUpClicked(role.Role, SignUpType.SignedUp)" disabled="@notIsRoleSignUpAllowed" hidden="@notIsRoleSignUpAllowed">Sign Up</button></td>
+                    <td><button class="raidButton" @onclick="() => SignUpClicked(role.Role, SignUpType.Maybe)" disabled="@notIsRoleSignUpAllowed" hidden="@notIsRoleSignUpAllowed">Maybe</button></td>
+                    <td><button class="raidButton" @onclick="() => SignUpClicked(role.Role, SignUpType.Backup)" disabled="@notIsBackupAllowed" hidden="@notIsBackupAllowed">Backup</button></td>
                     @if (isSignedUp && _raid.RaidType == RaidType.Planned)
                     {
                         <td><button class="raidButton" @onclick="() => SignUpClicked(role.Role, SignUpType.Flex)">Flex</button></td>