diff --git a/booking.regn_form.inc b/booking.regn_form.inc
index ae859ce..f68c3da 100644
--- a/booking.regn_form.inc
+++ b/booking.regn_form.inc
@@ -1215,7 +1215,14 @@ function booking_form_submit($form, &$form_state)
   global $event;
   
   $values = $form_state['input'];
-  
+
+  //strip any emojis from user input
+  if (variable_get('booking_enable_emoji_removal', 1) == 1) {
+    foreach ($values as $key => $value) {
+      $values[$key] = _booking_remove_emoji($value);
+    }
+  }
+
   //get DOB from form
   $dob = _datearray_to_ts($values['booking_dob']);
   
@@ -1238,7 +1245,7 @@ function booking_form_submit($form, &$form_state)
     '!event' => $event->booking_eventname,
     '!name' => $values['booking_firstname'] . ' ' . $values['booking_lastname']
   ));
-  $title = _booking_remove_emoji($title);
+  //$title = _booking_remove_emoji($title);
   $node->title = $title;
   $node->type = 'booking';
   $node->status = 1; // set published to true
diff --git a/booking.regn_node.inc b/booking.regn_node.inc
index b4550ac..31eb0f3 100644
--- a/booking.regn_node.inc
+++ b/booking.regn_node.inc
@@ -4,19 +4,13 @@
 function booking_node_presave($node) {
 	global $event;
 	
-	if($node->type == 'booking')
-	{
+	if($node->type == 'booking') {
 		$title = t('!event registration: !name', array(
 			'!event' => $event->booking_eventname,
 			'!name' => $node->booking_firstname . ' ' . $node->booking_lastname,
 		));
 		$title = _booking_remove_emoji($title);
-		$node->title = $title;
-
-
-		//$node->title = t('!event registration: !name', 
-		//	array('!event' => $event->booking_eventname, '!name' => $node->booking_firstname . ' ' . $node->booking_lastname));	
-		//watchdog('booking', 'Presave of person: @info', array('@info' => var_export($node, TRUE)));		
+		$node->title = $title;	
 	}
 }