diff --git a/app/views/shop/_messages.html.haml b/app/views/shop/_messages.html.haml
index 3b9b6c0ad0..4ec821882f 100644
--- a/app/views/shop/_messages.html.haml
+++ b/app/views/shop/_messages.html.haml
@@ -1,24 +1,6 @@
 - if require_customer?
-  .content{ "darker-background" => true }
-    .row.footer-pad
-      .small-12.columns
-        .shopfront_hidden_message
-          %strong
-            = t '.require_customer_login'
-          %p
-          - if spree_current_user.nil?
-            %p
-              = t '.require_login_html',
-                {login: ('<a auth="login">' + t('.login') + '</a>').html_safe,
-                 signup: ('<a auth="signup">' + t('.signup') + '</a>').html_safe}
-            %p
-              = t '.require_login_2_html',
-                {contact: link_to(t('.contact'), '#contact'),
-                 enterprise: current_distributor.name}
-          - else
-            = t '.require_customer_html',
-              {contact: link_to(t('.contact'), '#contact'),
-               enterprise: current_distributor.name}
+  = render partial: "shop/messages/customer_required"
+
 - else
   - if no_open_order_cycles?
     = render partial: "shop/closed_shop"
diff --git a/app/views/shop/messages/_customer_required.html.haml b/app/views/shop/messages/_customer_required.html.haml
new file mode 100644
index 0000000000..c320ee7405
--- /dev/null
+++ b/app/views/shop/messages/_customer_required.html.haml
@@ -0,0 +1,20 @@
+.content{ "darker-background" => true }
+  .row.footer-pad
+    .small-12.columns
+      .shopfront_hidden_message
+        %strong
+          = t '.require_customer_login'
+        %p
+        - if spree_current_user.nil?
+          %p
+            = t '.require_login_html',
+              {login: ('<a auth="login">' + t('.login') + '</a>').html_safe,
+               signup: ('<a auth="signup">' + t('.signup') + '</a>').html_safe}
+          %p
+            = t '.require_login_2_html',
+              {contact: link_to(t('.contact'), '#contact'),
+               enterprise: current_distributor.name}
+        - else
+          = t '.require_customer_html',
+            {contact: link_to(t('.contact'), '#contact'),
+             enterprise: current_distributor.name}