diff --git a/user_relationship_invites/user_relationship_invites.module b/user_relationship_invites/user_relationship_invites.module
index 9a516cc..76aff1e 100644
--- a/user_relationship_invites/user_relationship_invites.module
+++ b/user_relationship_invites/user_relationship_invites.module
@@ -77,26 +77,29 @@ function user_relationship_invites_user($op, &$edit, &$account, $category = NULL
 
   switch ($op) {
     case 'register':
-      if (($code = $_SESSION[INVITE_SESSION]) && ($invite = user_relationship_invites_get_invite($code)) && $invite->relationship_type) {
-        $form = array();
-        $inviter = $invite->inviter;
-        $relationship_type = $invite->relationship_type;
+      if (!empty($_SESSION[INVITE_SESSION])) {
+        $invite = user_relationship_invites_get_invite($_SESSION[INVITE_SESSION]);
+        if (!empty($invite) && $invite->relationship_type) {
+          $form = array();
+          $inviter = $invite->inviter;
+          $relationship_type = $invite->relationship_type;
 
-        // approval is required so ask for it
-        if (!$relationship_type->is_oneway || $relationship_type->requires_approval) {
-          $form['relationship_invite_approve'] = array(
-            '#type' => 'radios',
-            '#title' => t('Please confirm the %relationship_name request from !name', array('!name' => theme('username', $inviter), '%relationship_name' => $relationship_type->name)),
-            '#default_value' => (isset($edit['relationship_invite_approve']) ? $edit['relationship_invite_approve'] : 'approve'),
-            '#options' => array('approve' => t('Yes'), 'disapprove' => t('No'))
-          );
-        }
+          // If approval is required ask for it here.
+          if (!$relationship_type->is_oneway || $relationship_type->requires_approval) {
+            $form['relationship_invite_approve'] = array(
+              '#type' => 'radios',
+              '#title' => t('Please confirm the %relationship_name request from !name', array('!name' => theme('username', $inviter), '%relationship_name' => $relationship_type->name)),
+              '#default_value' => (isset($edit['relationship_invite_approve']) ? $edit['relationship_invite_approve'] : 'approve'),
+              '#options' => array('approve' => t('Yes'), 'disapprove' => t('No'))
+            );
+          }
         // otherwise force an approval
+        }
         else {
           $form['relationship_invite_approve'] = array('#type' => 'value', '#value' => 'approve');
         }
 
-        $form['invite_code'] = array('#type' => 'value', '#value' => $code);
+        $form['invite_code'] = array('#type' => 'value', '#value' => $_SESSION[INVITE_SESSION]);
         $form['relationship_invite_requester'] = array('#type' => 'value', '#value' => $inviter);
         $form['relationship_type'] = array('#type' => 'value', '#value' => $relationship_type);
         return $form;