diff --git a/scheduled_actions_node/scheduled_actions_node.module b/scheduled_actions_node/scheduled_actions_node.module
index 652412e..c875370 100644
--- a/scheduled_actions_node/scheduled_actions_node.module
+++ b/scheduled_actions_node/scheduled_actions_node.module
@@ -547,7 +547,7 @@ function scheduled_actions_node_add_action_ajax_callback(&$form, &$form_state) {
  */
 function scheduled_actions_node_add_action_submit(&$form, &$form_state) {
   // Add scheduled actions.
-  if ($form_state['clicked_button']['#name'] == 'add_scheduled_action_submit') {
+  if ($form_state['triggering_element']['#name'] == 'add_scheduled_action_submit') {
     // Save data
     $data['time'] = strtotime($form_state['values']['time']);
     $data['aid'] = $form_state['values']['action'];
@@ -574,7 +574,7 @@ function scheduled_actions_node_add_action_submit(&$form, &$form_state) {
 
 
   // Remove actions.
-  elseif ($form_state['clicked_button']['#name'] == 'remove_scheduled_action_submit') {
+  elseif ($form_state['triggering_element']['#name'] == 'remove_scheduled_action_submit') {
     // Already created node.
     if (isset($form['nid']['#value'])) {
       // Remove actions
@@ -647,8 +647,7 @@ function scheduled_actions_node_add_action_validate($element, &$form_state) {
          form_error($element, t('Time must be set.'));
       }
       else {
-        $date = date_popup_input_date($element, $element['#value']);
-        if ($date->getTimestamp() < REQUEST_TIME) {
+        if (strtotime(implode(" ", $element['#value'])) < REQUEST_TIME) {
            form_error($element, t('Time must be in future.'));
         }
       }