diff --git a/salsa_signup_page/salsa_signup_page.module b/salsa_signup_page/salsa_signup_page.module
index 9b678ac..4a40fbf 100644
--- a/salsa_signup_page/salsa_signup_page.module
+++ b/salsa_signup_page/salsa_signup_page.module
@@ -285,7 +285,13 @@ function salsa_signup_page_form_submit($form, &$form_state) {
       $form_state['redirect'] = $form_state['salsa_object']->redirect_path;
     }
     else {
-      $form_state['redirect'] = '<front>';
+      // No redirect, display a thank you message.
+      drupal_set_message(t('Thank you for your submission.'));
+      // If we are on the page of this form, redirect to the frontpage,
+      // otherwise remain on the current page.
+      if (current_path() == 'salsa/signup_page/' . $form_state['salsa_object']->signup_page_KEY) {
+        $form_state['redirect'] = '<front>';
+      }
     }
   }
 }