diff --git a/modules/checkout/commerce_checkout.module b/modules/checkout/commerce_checkout.module
index 7137694..005c455 100644
--- a/modules/checkout/commerce_checkout.module
+++ b/modules/checkout/commerce_checkout.module
@@ -868,6 +868,15 @@ function commerce_checkout_create_account($name, $mail, $pass, $status, $notify
  * Returns the default checkout completion message.
  */
 function commerce_checkout_completion_message_default() {
-  return t('Your order is number [commerce-order:order-number]. You can <a href="[commerce-order:url]">view your order</a> on your account page when logged in.')
-    . "\n\n" . t('<a href="[site:url]">Return to the front page.</a>');
+  $message = 'Your order is number [commerce-order:order-number]. ';
+
+  if (filter_format_load('filtered_html')) {
+    $message .= 'You can <a href="[commerce-order:url]">view your order</a> on your account page when logged in.';
+    $message .= "\n\n" . t('<a href="[site:url]">Return to the front page.</a>');
+  }
+  else {
+    $message .= 'You can view your order on your account page when logged in.';
+  }
+
+  return t($message);
 }