diff --git a/modules/checkout/commerce_checkout.module b/modules/checkout/commerce_checkout.module
index af6eec7..63e9c8c 100644
--- a/modules/checkout/commerce_checkout.module
+++ b/modules/checkout/commerce_checkout.module
@@ -27,6 +27,7 @@ function commerce_checkout_theme() {
       'variables' => [
         'order_entity' => NULL,
         'payment_instructions' => NULL,
+        'order_summary' => NULL,
       ],
     ],
     'commerce_checkout_form' => [
diff --git a/modules/checkout/src/Plugin/Commerce/CheckoutPane/CompletionMessage.php b/modules/checkout/src/Plugin/Commerce/CheckoutPane/CompletionMessage.php
index fef9352..a76cd46 100644
--- a/modules/checkout/src/Plugin/Commerce/CheckoutPane/CompletionMessage.php
+++ b/modules/checkout/src/Plugin/Commerce/CheckoutPane/CompletionMessage.php
@@ -22,6 +22,13 @@ class CompletionMessage extends CheckoutPaneBase {
     $pane_form['#theme'] = 'commerce_checkout_completion_message';
     $pane_form['#order_entity'] = $this->order;
 
+    $pane_form['#order_summary'] = [
+      '#theme' => 'commerce_checkout_order_summary',
+      '#order_entity' => $this->order,
+      '#checkout_flow_plugin_id' => $this->checkoutFlow->getPluginId(),
+      '#checkout_flow_step' => $complete_form['#step_id'],
+    ];
+
     return $pane_form;
   }
 
diff --git a/modules/checkout/templates/commerce-checkout-completion-message.html.twig b/modules/checkout/templates/commerce-checkout-completion-message.html.twig
index 5c8727f..5fa5738 100644
--- a/modules/checkout/templates/commerce-checkout-completion-message.html.twig
+++ b/modules/checkout/templates/commerce-checkout-completion-message.html.twig
@@ -11,8 +11,13 @@
  */
 #}
 <div class="checkout-complete">
-  {{ 'Your order number is @number.'|t({'@number': order_entity.getOrderNumber}) }} <br>
-  {{ 'You can view your order on your account page when logged in.'|t }} <br>
+  {% if logged_in %}
+    {% set order_url = path('entity.commerce_order.user_view', {'user': order_entity.getCustomerId, 'commerce_order': order_entity.getOrderNumber}) %}
+    {{ 'Your order number is <a href="@order_url">@number</a>.'|t({'@order_url': order_url,'@number': order_entity.getOrderNumber}) }} <br>
+  {% else %}
+    {{ 'Your order number is @number.'|t({'@number': order_entity.getOrderNumber}) }} <br>
+    {{ 'You can view your order on your account page when logged in.'|t }} <br>
+  {% endif %}
 
   {% if payment_instructions %}
     <div class="checkout-complete__payment-instructions">
@@ -20,4 +25,5 @@
       {{ payment_instructions }}
     </div>
   {% endif %}
+  {{ order_summary }}
 </div>