diff --git a/woocommerce/checkout/form-checkout.php b/woocommerce/checkout/form-checkout.php
index c8f4413..a414b9c 100644
--- a/woocommerce/checkout/form-checkout.php
+++ b/woocommerce/checkout/form-checkout.php
@@ -24,8 +24,8 @@ wc_print_notices();
 
 do_action( 'woocommerce_before_checkout_form', $checkout );
 
-if ( ! $checkout->enable_signup && ! $checkout->enable_guest_checkout && ! is_user_logged_in() ) {
 // If checkout registration is disabled and not logged in, the user cannot checkout
+if ( ! $checkout->is_registration_enabled() && $checkout->is_registration_required() && ! is_user_logged_in() ) {
 	echo apply_filters( 'woocommerce_checkout_must_be_logged_in_message', __( 'You must be logged in to checkout.', 'understrap' ) );
 	return;
 }