diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php
index 88850296b1..f704b96f5b 100644
--- a/lib/Config/Menu.php
+++ b/lib/Config/Menu.php
@@ -255,6 +255,7 @@ class Menu {
     $data = array(
       'settings' => $settings,
       'segments' => Segment::getPublic()->findArray(),
+      'task_scheduler' => TaskScheduler::getAvailableMethods(),
       'pages' => Pages::getAll(),
       'flags' => $flags,
       'current_user' => wp_get_current_user(),
diff --git a/lib/Config/Populator.php b/lib/Config/Populator.php
index 65ae2bd54a..b424dfa2c2 100644
--- a/lib/Config/Populator.php
+++ b/lib/Config/Populator.php
@@ -74,6 +74,13 @@ class Populator {
   private function createDefaultSettings() {
     $current_user = wp_get_current_user();
 
+    if(!Setting::getValue('task_scheduler')) {
+      // disable task scheduler (cron) be default
+      Setting::setValue('task_scheduler', array(
+        'method' => TaskScheduler::METHOD_WORDPRESS
+      ));
+    }
+
     // default sender info based on current user
     $sender = array(
       'name' => $current_user->display_name,
diff --git a/views/settings/advanced.html b/views/settings/advanced.html
index 6e1e555f11..ca2c2c2f01 100644
--- a/views/settings/advanced.html
+++ b/views/settings/advanced.html
@@ -40,9 +40,8 @@
             <input
               type="radio"
               name="task_scheduler[method]"
-              value="WordPress"
-              <% if not(settings.task_scheduler.method)
-                or (settings.task_scheduler.method == 'WordPress') %>
+              value="<%= task_scheduler.wordpress %>"
+              <% if (settings.task_scheduler.method == task_scheduler.wordpress) %>
               checked="checked"
               <% endif %>
             /><%= __('Visitors to your website (recommended)') %>