diff --git a/salsa_event/salsa_event.module b/salsa_event/salsa_event.module
index d538872..696c128 100644
--- a/salsa_event/salsa_event.module
+++ b/salsa_event/salsa_event.module
@@ -750,7 +750,13 @@ function salsa_event_form_submit($form, &$form_state) {
     salsa_event_add_token_data($form_state['additional'], $event);
   }
 
-  $event->email_trigger_KEYS = implode(',', salsa_event_get_email_trigger_key($event));
+  $status = (salsa_event_get_subscription_state($event) == SALSA_EVENT_SUBSCRIPTION_STATE_SUBSCRIBING) ? SALSA_EVENT_SIGNED_UP : SALSA_EVENT_WAITING_LIST;
+  if ($status == SALSA_EVENT_SIGNED_UP) {
+    $event->email_trigger_KEYS = implode(',', salsa_event_get_email_trigger_key($event));
+  }
+  else {
+    $event->email_trigger_KEYS = implode(',', salsa_event_get_email_trigger_key($event, 'waiting_list'));
+  }
   // This is useful for tokens in confirmation mails.
   salsa_entity_supporter_fieldset_submit($form, $form_state);
 
@@ -808,7 +814,7 @@ function salsa_event_form_submit($form, &$form_state) {
     'supporter_KEY' => $form_state['supporter']->supporter_KEY,
     'event_KEY' => $event->event_KEY,
     '_Type' => 'Supporter',
-    '_Status' => (salsa_event_get_subscription_state($event) == SALSA_EVENT_SUBSCRIPTION_STATE_SUBSCRIBING) ? SALSA_EVENT_SIGNED_UP : SALSA_EVENT_WAITING_LIST,
+    '_Status' => $status,
   );
   $supporter_event = entity_create('salsa_supporter_event', $values);
   // Add number of additional attendees if any guests were signed up.