diff --git a/simple_pass_reset.module b/simple_pass_reset.module
index bcbab26..ead499e 100644
--- a/simple_pass_reset.module
+++ b/simple_pass_reset.module
@@ -80,8 +80,13 @@ function simple_pass_reset_pass_reset_page($uid, $timestamp, $hashed_pass, $opti
 function simple_pass_reset_form_user_profile_form_alter(&$form, &$form_state) {
   // Don't alter the normal profile edit form, but only the password reset form.
   if (arg(0) == 'user' && arg(1) == 'reset' && !user_is_logged_in()) {
-    // Our submit handler will log the user in after form submit.
-    $form['#submit'][] = 'simple_pass_reset_pass_reset_submit';
+    // The submit handler will log in the user after form submission.
+    if (!empty($form['actions']['submit']['#submit'])) {
+      $form['actions']['submit']['#submit'][] = 'simple_pass_reset_pass_reset_submit';
+    }
+    else {
+      $form['#submit'][] = 'simple_pass_reset_pass_reset_submit';
+    }
 
     $form['actions']['submit']['#value'] = t('Save and log in as !username', array('!username' => format_username($form['#user'])));