diff --git a/booking.regn_form.inc b/booking.regn_form.inc
index 3a5bff4..587a2a6 100644
--- a/booking.regn_form.inc
+++ b/booking.regn_form.inc
@@ -1455,8 +1455,10 @@ function booking_payment_completed_page()
   //set the page title
   $bookingTitle = !empty($event->booking_eventname) ? $event->booking_eventname : 'Event';
   drupal_set_title($bookingTitle . ' Registration Completed');
+  $input = variable_get('booking_regn_completed_page');
+  watchdog('booking_debug', "<pre>Paypal landing page token:\n@info</pre>", array('@info' => print_r($input['value'] , true)));
   
-  $output = token_replace(variable_get('booking_regn_completed_page'), booking_define_tokens());
+  $output = token_replace($input['value'], booking_define_tokens());
   $return_array[] = array(
     'paragraph' => array(
       '#type' => 'markup',
diff --git a/booking.tokens.inc b/booking.tokens.inc
index 5eb063a..c8a8efb 100644
--- a/booking.tokens.inc
+++ b/booking.tokens.inc
@@ -193,11 +193,14 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text
 		'#description' => t(''),
 		'#default_value' => variable_get('booking_regn_confirm_married_text', $booking_regn_confirm_married_text),
 	);
+	//$booking_regn_completed_page_default = variable_get('booking_regn_completed_page');
+	//$booking_regn_completed_page = isset($booking_regn_completed_page_default['value']) ? $booking_regn_completed_page_default['value'] : '';
 	$form['confirmation']['booking_regn_completed_page'] = array(
 		'#title' => t('Text to use for landing page on return from paypal website'),
 		'#type' => 'textarea',
 		'#description' => t(''),
-		'#default_value' => variable_get('booking_regn_completed_page', '<p>Thankyou for registering for [booking:eventname].</p>'),
+		//'#default_value' => $booking_regn_completed_page,
+		'#default_value' => isset(variable_get('booking_regn_completed_page')['value']) ? variable_get('booking_regn_completed_page')['value'] : $defaults,
 		'#type' => 'text_format',
 		'#format' => 'full_html',		
 	);
@@ -754,4 +757,4 @@ function booking_define_personspecific_tokens($node)
 	}
 	
 	return $tokens;		
-}
\ No newline at end of file
+}