diff --git a/Lieb/Data/DiscordService.cs b/Lieb/Data/DiscordService.cs
index 6c22936..dc9d97e 100644
--- a/Lieb/Data/DiscordService.cs
+++ b/Lieb/Data/DiscordService.cs
@@ -168,7 +168,7 @@ namespace Lieb.Data
             HashSet<ulong> userIds = new HashSet<ulong>();
             foreach(RaidSignUp signUp in raid.SignUps)
             {
-                if(signUp.LiebUserId.HasValue)
+                if(signUp.LiebUserId.HasValue && signUp.IsMessageSignUp)
                 {
                     userIds.Add(signUp.LiebUserId.Value);
                 }
diff --git a/Lieb/Data/PollService.cs b/Lieb/Data/PollService.cs
index 469d776..3690e27 100644
--- a/Lieb/Data/PollService.cs
+++ b/Lieb/Data/PollService.cs
@@ -73,7 +73,7 @@ namespace Lieb.Data
                             .FirstOrDefault(r => r.RaidId == raidId);
 
             if (raid == null) return 0;
-            HashSet<ulong> users = raid.SignUps.Where(s => s.LiebUserId != null).Select(s => (ulong)s.LiebUserId).ToHashSet();
+            HashSet<ulong> users = raid.SignUps.Where(s => s.LiebUserId != null && s.IsMessageSignUp).Select(s => (ulong)s.LiebUserId).ToHashSet();
             return await CreatePoll(poll, users, raidId);
         }
 
diff --git a/Lieb/Data/RaidTemplateService.cs b/Lieb/Data/RaidTemplateService.cs
index 78ec043..d5a3bb6 100644
--- a/Lieb/Data/RaidTemplateService.cs
+++ b/Lieb/Data/RaidTemplateService.cs
@@ -93,6 +93,7 @@ namespace Lieb.Data
             template.StartTime = template.StartTime.AddDays(template.Interval);
             template.EndTime = template.EndTime.AddDays(template.Interval);
             template.FreeForAllTime = template.FreeForAllTime.AddDays(template.Interval);
+            template.MinUserDeadLine = template.MinUserDeadLine.AddDays(template.Interval);
             foreach(RaidReminder reminder in template.Reminders)
             {
                 reminder.ReminderTimeUTC = reminder.ReminderTimeUTC.AddDays(template.Interval);