diff --git a/booking.travel.inc b/booking.travel.inc
index 1d24caa..e63c930 100644
--- a/booking.travel.inc
+++ b/booking.travel.inc
@@ -654,9 +654,10 @@ function travel_view($node, $view_mode)
   //and their boyfriend/girlfriend if it is defined	
   if ($person->booking_bf_gf_nid != 0) {
     $query = db_query("Select booking_firstname, booking_lastname from {booking_person} where nid = :nid", array(
-      ':nid' => $node->booking_bf_gf_nid
-    ))->fetchObject();
-    $bf_gf = $query->booking_firstname . " " . $query->booking_lastname;
+      ':nid' => $node->booking_bf_gf_nid))->fetchObject();
+    $bf_gf = l(t('!first !last', array('!first' => $query->booking_firstname, '!last' => $query->booking_lastname)), 
+              t('node/!id', array('!id' => $person->booking_bf_gf_nid,
+    )));
   } 
   else {
     $bf_gf = "N/A";    
@@ -715,14 +716,18 @@ function travel_view($node, $view_mode)
     $node->booking_medical_conditions
   );
   $rows[] = array(
-    t('Boyfriend/Girlfriend:'),
+    t('Name:'),
     l(t('!first !last', array(
-      '!first' => $bf_gf->booking_firstname,
-      '!last' => $bf_gf->booking_lastname,
+      '!first' => $person->booking_firstname,
+      '!last' => $person->booking_lastname,
     )), t('node/!id', array(
-      '!id' => $person->booking_bf_gf_nid,
+      '!id' => $node->booking_person_nid
     )))
   );  
+  $rows[] = array(
+    t('Boyfriend/Girlfriend:'),
+    $bf_gf
+  );
   $rows[] = array(
     t('Requested Room mate(s):'),
     $node->booking_room_mate1