diff --git a/infrastructure/api/vars.tf b/infrastructure/api/vars.tf
index c7a09ed..72dca1d 100644
--- a/infrastructure/api/vars.tf
+++ b/infrastructure/api/vars.tf
@@ -1,7 +1,7 @@
 variable "dynamodb_email_arn" {
-  type = "string"
+  type = string
 }
 
 variable "dynamodb_polls_arn" {
-  type = "string"
+  type = string
 }
\ No newline at end of file
diff --git a/schafkopf/core/dynamodb/poll_table.py b/schafkopf/core/dynamodb/poll_table.py
index cc15a88..5f52229 100644
--- a/schafkopf/core/dynamodb/poll_table.py
+++ b/schafkopf/core/dynamodb/poll_table.py
@@ -1,5 +1,5 @@
 import json
-from datetime import datetime
+from datetime import datetime, timedelta
 from typing import Optional
 
 from pydantic import BaseModel
@@ -11,7 +11,6 @@ class PollItem(BaseModel):
     running_poll_id: str
     start_next_poll_date: datetime
     new_poll_email_sent: datetime
-    event_invitation_email_sent: Optional[datetime] = None
     next_schafkopf_event: Optional[datetime] = None
 
     @staticmethod
@@ -24,15 +23,14 @@ def create_new(poll_id: str, next_poll_date: datetime) -> "PollItem":
         )
 
     def event_scheduled_update(self, event_date: datetime):
-        self.start_next_poll_date = event_date
+        self.start_next_poll_date = event_date + timedelta(days=1)
         self.next_schafkopf_event = event_date
-        self.event_invitation_email_sent = datetime.now()
 
     def poll_is_running(self) -> bool:
         return (
             self.running_poll_id and
             datetime.now() < self.start_next_poll_date and
-            self.event_invitation_email_sent is None
+            self.next_schafkopf_event is None
         )
 
     def is_time_to_start_new_poll(self) -> bool:
diff --git a/web/src/pages/SchedulingState.tsx b/web/src/pages/SchedulingState.tsx
index a7f8529..2ae7dfd 100644
--- a/web/src/pages/SchedulingState.tsx
+++ b/web/src/pages/SchedulingState.tsx
@@ -103,7 +103,9 @@ const SchedulingState: React.FC = () => {
               </TimelineOppositeContent>
               <TimelineSeparator>
                 <TimelineConnector/>
-                <ScheduledIcon/>
+                <TimelineDot color={poll.next_schafkopf_event === null ? "grey": "primary"} variant="outlined">
+                  <Timer/>
+                </TimelineDot>
                 <TimelineConnector/>
               </TimelineSeparator>
               <TimelineContent sx={{m: 'auto 0'}}>
@@ -135,12 +137,6 @@ const PendingIcon: React.FC = () => {
   </TimelineDot>
 }
 
-const ScheduledIcon: React.FC = () => {
-  return <TimelineDot color="grey" variant="outlined">
-    <Timer/>
-  </TimelineDot>
-}
-
 const formatDatetime = (d: string) => {
 
   return moment(d).format("dddd DD.MM.")