diff --git a/commerce_registration.module b/commerce_registration.module
index 84f5a02..d4b8273 100755
--- a/commerce_registration.module
+++ b/commerce_registration.module
@@ -367,9 +367,10 @@ function commerce_registration_form_alter(&$form, &$form_state, $form_id) {
       if (!function_exists("registration_entity_settings_form")) {
         module_load_include("inc", "registration", "/includes/registration.forms");
       }
-      if (!function_exists("commerce_registration_registrations_settings_form_validate")) {
+      if (!function_exists("commerce_registration_registration_settings_form_validate")) {
         module_load_include("inc", "commerce_registration", "/includes/commerce_registration.forms");
       }
+
       // Add validation and submission handlers to the form.
       $form['#validate'][] = "commerce_registration_registration_settings_form_validate";
       $form['actions']['submit']['#submit'][] = "commerce_registration_registration_settings_form_submit";
@@ -391,7 +392,9 @@ function commerce_registration_form_alter(&$form, &$form_state, $form_id) {
         ),
       );
       // Grab the registration settings form for this entity.
-      $addform = registration_entity_settings_form(array(), $form_state, $settings, "commerce_product", $product);
+      list($entity_id) = entity_extract_ids('commerce_product', $product);
+      $settings = registration_entity_settings('commerce_product', $entity_id);
+      $addform = registration_entity_settings_form(array(), $form_state, $settings, 'commerce_product', $product);
       // Remove the save button for this form since we have one already.
       unset($addform['save']);
       // We rename the registration settings form's status field to be reg_status
diff --git a/includes/commerce_registration.forms.inc b/includes/commerce_registration.forms.inc
index e374945..5d20523 100644
--- a/includes/commerce_registration.forms.inc
+++ b/includes/commerce_registration.forms.inc
@@ -36,6 +36,8 @@ function commerce_registration_node_registrations_settings_form($form, &$form_st
             '#collapsible' => TRUE,
             '#collapsed' => TRUE,
           );
+          list($entity_id) = entity_extract_ids('commerce_product', $product);
+          $settings = registration_entity_settings('commerce_product', $entity_id);
           $addform = registration_entity_settings_form($form, $form_state, $settings, 'commerce_product', $product);
           unset($addform['save']);
           $addform['status']['#weight'] = -10;
@@ -182,10 +184,10 @@ function commerce_registration_registrations_broadcast_form_submit($form, &$form
 function commerce_registration_registration_settings_form_validate($form, $form_state) {
   $temp_form_state = array('values' => $form_state['values']['registration_settings']);
   $temp_form_state['values']['status'] = $temp_form_state['values']['reg_status'];
-  if (!function_exists('registration_registrations_settings_form_validate')) {
+  if (!function_exists('registration_entity_settings_form_validate')) {
     module_load_include('inc', 'registration', '/includes/registration.forms');
   }
-  return registration_registrations_settings_form_validate($form, $temp_form_state);
+  return registration_entity_settings_form_validate($form, $temp_form_state);
 }
 
 /**
@@ -201,5 +203,5 @@ function commerce_registration_registration_settings_form_submit($form, &$form_s
     'values' => $form_state['values']['registration_settings'],
   );
   $temp_form_state['values']['status'] = $temp_form_state['values']['reg_status'];
-  registration_registrations_settings_form_submit($form, $temp_form_state);
+  registration_entity_settings_form_submit($form, $temp_form_state);
 }