diff --git a/colorbox_node.module b/colorbox_node.module
index d0c4949..53075f3 100644
--- a/colorbox_node.module
+++ b/colorbox_node.module
@@ -96,7 +96,7 @@ function colorbox_node_output($path) {
           var params = '. $params .';
           $.fn.colorbox($.extend({}, Drupal.settings.colorbox, params));
         });
-        
+
         // We need to clear out our html just in case there is
         // a video with autoplay.
         $(document).bind("cbox_closed", function() {
@@ -194,23 +194,19 @@ function colorbox_node_webform_js_submit($form, &$form_state) {
     $node = node_load($form_state['values']['details']['nid']);
 
     // Find out what we should be doing for the webform.
-    if($node->webform['redirect_url'] == '<confirmation>') {
-      // Display a confirmation message.
-      $markup = check_markup($node->webform['confirmation'], $node->webform['confirmation_format'], '', TRUE) . $javascript;
-    }
-    elseif($node->webform['redirect_url'] == '<none>') {
+    if ($node->webform['redirect_url'] == '<confirmation>' || $node->webform['redirect_url'] == '<none>') {
       // Display a confirmation message.
-      $markup = check_markup($node->webform['confirmation'], $node->webform['confirmation_format'], '', TRUE) . $javascript;
+      $markup = theme(array('webform_confirmation_' . $node->nid, 'webform_confirmation'), array('node' => $node)) . $javascript;
     }
     else {
       $path = $form_state['redirect'][0];
       $options = $form_state['redirect'][1];
-      
+
       drupal_alter('drupal_goto', $path, $options);
-    
+
       // The 'Location' HTTP header must be absolute.
       $options['absolute'] = TRUE;
-    
+
       $url = url($path, $options);
       // We are doing a redirect so we need to close the colorbox
       // and then force a window.location on the passed in URL.