diff --git a/commons_groups.module b/commons_groups.module
index cca0018..7b091f0 100644
--- a/commons_groups.module
+++ b/commons_groups.module
@@ -32,15 +32,29 @@ function commons_groups_block_view() {
 }
 
 /**
-* Implements hook_form_alter().
-*/
+ * Implements hook_form_alter().
+ */
 function commons_groups_form_alter(&$form, &$form_state, $form_id) {
-  if ($form_id == 'group_node_form' && is_null($form['nid']['#value']) && $node->status == 0) {
+  if ($form_id == 'group_node_form' && is_null($form['nid']['#value'])) {
     $form['actions']['submit']['#submit'][] = 'commons_groups_group_submission_message';
   }
   if (isset($form['#node'])) {
     $enabled_node_types = commons_groups_get_enabled_node_types();
-    if (isset($enabled_node_types[$form['#node']->type])) {
+    $valid_form_id = FALSE;
+
+    $count_types = count($enabled_node_types);
+    $node_types = array_keys($enabled_node_types);
+    $i = 0;
+
+    while ($valid_form_id != TRUE && $i < $count_types) {
+      $expected_form_id = $node_types[$i] . '_node_form';
+      if ($form_id == $expected_form_id) {
+        $valid_form_id = TRUE;
+      }
+      $i++;
+    }
+
+    if ($valid_form_id) {
       $form['actions']['submit']['#submit'][] = 'commons_groups_node_in_group_submit';
     }
   }
@@ -58,7 +72,7 @@ function commons_groups_form_alter(&$form, &$form_state, $form_id) {
 /**
  * Submit handler called if the form is for a node enabled as group content.
  */
-function commons_groups_node_in_group_submit(&$form, &$form_state) {
+function commons_groups_node_in_group_submit($form, &$form_state) {
   if (isset($form_state['values']['og_group_ref'][LANGUAGE_NONE][0])) {
     $group = $form_state['values']['og_group_ref'][LANGUAGE_NONE][0]['target_id'];
     $form_state['redirect'] = 'node/' . $group;
@@ -227,8 +241,10 @@ function commons_groups_message_partial_default() {
   return $partial;
 }
 
-function commons_groups_group_submission_message() {
-  drupal_set_message(t('Thanks for your group submission! This group has entered the moderation queue and will be reviewed shortly.'));
+function commons_groups_group_submission_message($form, &$form_state) {
+  if ($form_state['values']['status'] !== 1) {
+    drupal_set_message(t('Thanks for your group submission! This group has entered the moderation queue and will be reviewed shortly.'));
+  }
 }
 
 /**