diff --git a/domain.admin.inc b/domain.admin.inc
index 7bd92b2..baf4568 100644
--- a/domain.admin.inc
+++ b/domain.admin.inc
@@ -490,6 +490,13 @@ function domain_form_submit($form, &$form_state) {
   if (empty($form_state['values']['domain_arguments']['user_submitted'])) {
     drupal_set_message($message);
   }
+  
+  //Update the domain_id in $form_state for any modules that need to reference it.
+  if (empty($form_state['values']['domain_id'])) {
+    $element = array('#parents' => array('domain_id'));
+    form_set_value($element, $domain['domain_id'],$form_state);
+  }
+  
   return $domain;
 }