diff --git a/lib/Cron/Workers/Scheduler.php b/lib/Cron/Workers/Scheduler.php
index 40a1ac3546..cfde202aac 100644
--- a/lib/Cron/Workers/Scheduler.php
+++ b/lib/Cron/Workers/Scheduler.php
@@ -32,14 +32,12 @@ class Scheduler {
         ->findOne($queue->newsletter_id);
       if(!$newsletter || $newsletter->deleted_at !== null) {
         $queue->delete();
-      } else {
-        if($newsletter->type === 'welcome') {
-          $this->processWelcomeNewsletter($newsletter, $queue);
-        } elseif($newsletter->type === 'notification') {
-          $this->processPostNotificationNewsletter($newsletter, $queue);
-        } elseif($newsletter->type === 'standard') {
-          $this->processScheduledStandardNewsletter($newsletter, $queue);
-        }
+      } elseif($newsletter->type === 'welcome') {
+        $this->processWelcomeNewsletter($newsletter, $queue);
+      } elseif($newsletter->type === 'notification') {
+        $this->processPostNotificationNewsletter($newsletter, $queue);
+      } elseif($newsletter->type === 'standard') {
+        $this->processScheduledStandardNewsletter($newsletter, $queue);
       }
       CronHelper::checkExecutionTimer($this->timer);
     }
diff --git a/lib/Newsletter/Scheduler/Scheduler.php b/lib/Newsletter/Scheduler/Scheduler.php
index 804c5c31bf..56fdcd9f0e 100644
--- a/lib/Newsletter/Scheduler/Scheduler.php
+++ b/lib/Newsletter/Scheduler/Scheduler.php
@@ -73,7 +73,11 @@ class Scheduler {
     }
   }
 
-  static function standard($timestamp) {
+  /**
+   * Create a properly formatted timestamp for use in Scheduler from
+   * arbitrarily formatted timestamp strings.
+   */
+  static function scheduleFromTimestamp($timestamp) {
     return Carbon::parse($timestamp)->format('Y-m-d H:i:s');
   }
 
diff --git a/lib/Router/SendingQueue.php b/lib/Router/SendingQueue.php
index 30bbfd4289..cd18dce13c 100644
--- a/lib/Router/SendingQueue.php
+++ b/lib/Router/SendingQueue.php
@@ -82,7 +82,9 @@ class SendingQueue {
 
     if ((bool)$newsletter['isScheduled']) {
       $queue->status = 'scheduled';
-      $queue->scheduled_at = Scheduler::standard($newsletter['scheduledAt']);
+      $queue->scheduled_at = Scheduler::scheduleFromTimestamp(
+        $newsletter['scheduledAt']
+      );
 
       $message = __('The newsletter has been scheduled.');
     } else {