diff --git a/webform_limit_submissions.module b/webform_limit_submissions.module
index bc67096..78e92f4 100644
--- a/webform_limit_submissions.module
+++ b/webform_limit_submissions.module
@@ -50,9 +50,10 @@ function webform_limit_submissions_form() {
     '#default_value' => _webform_limit_submissions_get_value(arg(1), 'submission_limits'),
     '#size' => 2,
   );
-  
+
   // Cut-off date (use Webform date component generator).
-  $component = array();
+  module_load_include('inc', 'webform', 'components/date');
+  $component = _webform_defaults_date();
   $component['name'] = 'Form cut-off date';
   $component['weight'] = 3;
   $component['mandatory'] = FALSE;
@@ -63,7 +64,7 @@ function webform_limit_submissions_form() {
   $component['extra']['year_textfield'] = FALSE;
   // TODO: get datepicker working also (if present).
   $component['extra']['datepicker'] = FALSE;
-  // User or site default timezone (snipped from date_api: date_default_timezone_name, 
+  // User or site default timezone (snipped from date_api: date_default_timezone_name,
   // no perceived need to load entire Date_API module).
   if (variable_get('configurable_timezones', 1) && !empty($user->timezone_name)) {
     $component['extra']['timezone'] = $user->timezone_name;
@@ -73,7 +74,6 @@ function webform_limit_submissions_form() {
     $component['extra']['timezone'] = empty($default) ? 'UTC' : $default;
   }
   // Let Webform date component build the element.
-  module_load_include('inc', 'webform', 'components/date'); 
   $form['submission']['submission_cutoff'] = _webform_render_date($component, $component['value'], FALSE);
 
   $form['submission']['submission_submit'] = array(
@@ -81,7 +81,7 @@ function webform_limit_submissions_form() {
     '#value' => t('Submit'),
     '#weight' => 1000,
   );
-  
+
   return $form;
 }
 
@@ -105,8 +105,8 @@ function webform_limit_submissions_form_submit($form, &$form_state) {
   $node = $form['#parameters'][2];
   $submission_limit = $form['submission']['submission_limits']['#value'];
   db_query('DELETE FROM {webform_limit_submissions} WHERE `nid` = %d', (int) $node->nid);
-  db_query("INSERT INTO {webform_limit_submissions} (`nid`, `sid`, `value`) VALUES (%d, %d, '%s')", (int) $node->nid, (int) $form['submission']['submission_limits']['#value'], serialize($form['submission']['submission_cutoff']['#value'])); 
-  
+  db_query("INSERT INTO {webform_limit_submissions} (`nid`, `sid`, `value`) VALUES (%d, %d, '%s')", (int) $node->nid, (int) $form['submission']['submission_limits']['#value'], serialize($form['submission']['submission_cutoff']['#value']));
+
   // Display a message
   drupal_set_message(t('The form has been saved.'));
 }
@@ -117,7 +117,7 @@ function webform_limit_submissions_form_submit($form, &$form_state) {
 function webform_limit_submissions_webform_submission_presave($node, &$submission) {
   // Get the value for the limit of submissions
   $max_submissions = _webform_limit_submissions_get_value($node->nid);
-      
+
   // Check if max submissions has been set or isn't equal to zero
   if ($max_submissions > 0) {
     // Count the current total of submissions in the database
@@ -127,7 +127,7 @@ function webform_limit_submissions_webform_submission_presave($node, &$submissio
       drupal_set_message(t('Your submission wasn\'t saved, because submissions for this form where allready closed when you submitted.'), 'error');
       drupal_goto('/node/' . $node->nid);
       exit;
-    }	
+    }
   }
 }
 
@@ -139,15 +139,15 @@ function webform_limit_submissions_nodeapi(&$node, $op, $teaser, $page) {
   $types = webform_variable_get('webform_node_types');
   if (in_array($node->type, $types)) {
     switch ($op){
-	    case 'load':
+      case 'load':
         // Set form status.
         $node->status = _webform_limit_submissions_limits_exceeded($node->nid);
-	    break;
-	    case 'delete':
+      break;
+      case 'delete':
         // If the node is being deleted, remove the record from the limit submissions table.
         db_query('DELETE FROM {webform_limit_submissions} WHERE `nid` = %d', $node->nid);
-	    break;
-	  }
+      break;
+    }
   }
 }
 
@@ -181,7 +181,7 @@ function _webform_limit_submissions_limits_exceeded($nid) {
     }
   }
 
-  // TODO: figure a plan with precedence... 
+  // TODO: figure a plan with precedence...
   // Is it okay to assume date is more important than number of submissions?
   // Alternatively, do we want to specify which of the two is more important?
   // Whatever - this decision tree still needs a clean-up...
@@ -196,7 +196,7 @@ function _webform_limit_submissions_limits_exceeded($nid) {
       $close = FALSE;
     }
   }
-  
+
   // Set form status
   if ($close) {
     db_query('UPDATE {webform} SET `status` = 0 WHERE `nid` = %d AND `status` = 1', $nid);
@@ -218,7 +218,7 @@ function _webform_limit_submissions_limits_exceeded($nid) {
 function _webform_limit_submissions_get_value($nid, $field = 'submission_limits') {
   // Retrieve required value.
   switch ($field){
-	  case 'submission_limits':
+    case 'submission_limits':
       $result = db_query('SELECT `sid` FROM {webform_limit_submissions} WHERE `nid` = %d', (int) $nid);
       if ($result === FALSE) {
         $value = FALSE;
@@ -226,8 +226,8 @@ function _webform_limit_submissions_get_value($nid, $field = 'submission_limits'
       else{
         $value = db_result($result);
       }
-	  break;
-	  case 'submission_cutoff':
+    break;
+    case 'submission_cutoff':
       $result = db_query('SELECT `value` FROM {webform_limit_submissions} WHERE `nid` = %d', (int) $nid);
       if ($result === FALSE) {
         $value = FALSE;
@@ -235,8 +235,8 @@ function _webform_limit_submissions_get_value($nid, $field = 'submission_limits'
       else{
         $value = unserialize(db_result($result));
       }
-	  break;
+    break;
   }
 
   return $value;
-}
\ No newline at end of file
+}