diff --git a/modules/invite_by_email/invite_by_email.module b/modules/invite_by_email/invite_by_email.module
index 12a98b2..94aca1b 100644
--- a/modules/invite_by_email/invite_by_email.module
+++ b/modules/invite_by_email/invite_by_email.module
@@ -104,22 +104,14 @@ function invite_by_email_form_invite_type_form_alter(&$form, &$form_state, $invi
  */
 function invite_by_email_form_invite_type_form_submit(&$form, &$form_state) {
   if (!empty($form_state['values']['invite_sending_controller']['invite_by_email'])) {
-    invite_by_email_invite_type_create($form_state['invite_type']);
+    $invite_type = $form_state['invite_type'];
+    invite_by_email_invite_type_create($invite_type);
+    variable_set(_invite_by_email_variable_name('use_default', $invite_type), $form_state['values']['use_default']);
+    variable_set(_invite_by_email_variable_name('message_editable', $invite_type), $form_state['values']['message_editable']);
   }
-
-//  invite_by_email_invite_type_create()
-//  if ($form_state['values']['invite_sending_controller'] == 'invite_by_email') {
-//    if (empty($form['#invite_type'])) {
-//      $invite_type = $form['#invite_type'];
-//    }
-//    else {
-//      $invite_type = invite_get_types($form_state['values']['type']);
-//    }
-//    variable_set(_invite_by_email_variable_name('use_default', $invite_type), $form_state['values']['use_default']);
-//    variable_set(_invite_by_email_variable_name('message_editable', $invite_type), $form_state['values']['message_editable']);
-//  }
 }
 
+
 /**
  * Creates new Invite entity type.
  *