diff --git a/includes/simplenews.subscription.inc b/includes/simplenews.subscription.inc
index 3bd33e3..3a6d7f4 100644
--- a/includes/simplenews.subscription.inc
+++ b/includes/simplenews.subscription.inc
@@ -178,7 +178,6 @@ function simplenews_confirm_add_form($form, &$form_state, $mail, $newsletter) {
     '#type' => 'value',
     '#value' => $newsletter,
   );
-  $form['#redirect'] = variable_get('simplenews_confirm_subscribe_page', '');
 
   return confirm_form($form,
     t('Confirm subscription'),
@@ -192,10 +191,12 @@ function simplenews_confirm_add_form($form, &$form_state, $mail, $newsletter) {
 function simplenews_confirm_add_form_submit($form, &$form_state) {
   simplenews_subscribe_user($form_state['values']['mail'], $form_state['values']['newsletter']->tid, FALSE, 'website');
 
-  // Display message if user is directed to the front page.
-  if (!$form['#redirect']) {
+  if (!$path =  variable_get('simplenews_confirm_subscribe_page', '')){
+    $path = variable_get('site_frontpage', 'node');
     drupal_set_message(t('%user was added to the %newsletter mailing list.', array('%user' => $form_state['values']['mail'], '%newsletter' => $form_state['values']['newsletter']->name)));
   }
+
+  $form_state['redirect'] = $path;
 }
 
 /**
@@ -217,7 +218,6 @@ function simplenews_confirm_removal_form($form, &$form_state, $mail, $newsletter
     '#type' => 'value',
     '#value' => $newsletter,
   );
-  $form['#redirect'] = variable_get('simplenews_confirm_unsubscribe_page', '');
 
   return confirm_form($form,
     t('Confirm remove subscription'),
@@ -231,10 +231,12 @@ function simplenews_confirm_removal_form($form, &$form_state, $mail, $newsletter
 function simplenews_confirm_removal_form_submit($form, &$form_state) {
   simplenews_unsubscribe_user($form_state['values']['mail'], $form_state['values']['newsletter']->tid, FALSE, 'website');
 
-  // Display message if user is directed to the front page.
-  if (!$form['#redirect']) {
+  if (!$path =  variable_get('simplenews_confirm_unsubscribe_page', '')){
+    $path = variable_get('site_frontpage', 'node');
     drupal_set_message(t('%user was unsubscribed from the %newsletter mailing list.', array('%user' => $form_state['values']['mail'], '%newsletter' => $form_state['values']['newsletter']->name)));
   }
+
+  $form_state['redirect'] = $path;
 }
 
 /**