diff --git a/modules/checkout/commerce_checkout.module b/modules/checkout/commerce_checkout.module
index 6223bc2..c4a4d04 100644
--- a/modules/checkout/commerce_checkout.module
+++ b/modules/checkout/commerce_checkout.module
@@ -867,7 +867,8 @@ function commerce_checkout_views_api() {
 /**
  * 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>');
+function commerce_checkout_completion_message_default($order) {
+  $commerce_order_url = url('user/' . $order->uid . '/orders/' . $order->order_id, array('absolute' => TRUE));
+  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.', array('!commerce_order_url' => $commerce_order_url))
+    . "\n\n" . t('<a href="!frontpage">Return to the front page.</a>', array('!frontpage' => url('<front>', array('absolute' => TRUE))));
 }
diff --git a/modules/checkout/includes/commerce_checkout.checkout_pane.inc b/modules/checkout/includes/commerce_checkout.checkout_pane.inc
index f191af5..06e94e0 100644
--- a/modules/checkout/includes/commerce_checkout.checkout_pane.inc
+++ b/modules/checkout/includes/commerce_checkout.checkout_pane.inc
@@ -57,13 +57,13 @@ function commerce_checkout_completion_message_pane_settings_form($checkout_pane)
 
   // Find our default message and text format values.
   if (!is_null(variable_get('commerce_checkout_completion_message', NULL))) {
-    $data = variable_get('commerce_checkout_completion_message', commerce_checkout_completion_message_default());
+    $data = variable_get('commerce_checkout_completion_message', commerce_checkout_completion_message_default($order));
 
     $message = $data['value'];
     $text_format = $data['format'];
   }
   else {
-    $message = commerce_checkout_completion_message_default();
+    $message = commerce_checkout_completion_message_default($order);
 
     if (filter_format_load('filtered_html')) {
       $text_format = 'filtered_html';