diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/checkout/AdyenApplePayExpressCheckoutController.java b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/checkout/AdyenApplePayExpressCheckoutController.java
index 1257e41c7..7334764f9 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/checkout/AdyenApplePayExpressCheckoutController.java
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/checkout/AdyenApplePayExpressCheckoutController.java
@@ -4,8 +4,8 @@
 import com.adyen.v6.facades.AdyenExpressCheckoutFacade;
 import com.adyen.v6.request.ApplePayExpressCartRequest;
 import com.adyen.v6.request.ApplePayExpressPDPRequest;
-import de.hybris.platform.acceleratorstorefrontcommons.security.AutoLoginStrategy;
-import de.hybris.platform.servicelayer.user.UserService;
+import de.hybris.platform.acceleratorstorefrontcommons.security.GUIDCookieStrategy;
+import de.hybris.platform.servicelayer.session.SessionService;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -27,10 +27,10 @@ public class AdyenApplePayExpressCheckoutController {
     private AdyenExpressCheckoutFacade adyenExpressCheckoutFacade;
 
     @Autowired
-    private UserService userService;
+    private SessionService sessionService;
 
     @Autowired
-    private AutoLoginStrategy autoLoginStrategy;
+    private GUIDCookieStrategy guidCookieStrategy;
 
     @PostMapping("/expressCheckout/applePayPDP")
     public ResponseEntity applePayExpressPDP(final HttpServletRequest request, final HttpServletResponse response, @RequestBody ApplePayExpressPDPRequest applePayExpressPDPRequest) throws Exception {
@@ -39,7 +39,8 @@ public ResponseEntity applePayExpressPDP(final HttpServletRequest request, final
                 applePayExpressPDPRequest.getAdyenApplePayMerchantIdentifier(), applePayExpressPDPRequest.getAdyenApplePayMerchantName(),
                 applePayExpressPDPRequest.getApplePayToken(), request);
 
-        autoLoginStrategy.login(userService.getCurrentUser().getUid(), null, request, response);
+        guidCookieStrategy.setCookie(request, response);
+        sessionService.setAttribute("anonymous_checkout", Boolean.TRUE);
 
         return new ResponseEntity<>(paymentsResponse, HttpStatus.OK);
     }
@@ -51,7 +52,8 @@ public ResponseEntity cartExpressCheckout(final HttpServletRequest request, fina
                 applePayExpressCartRequest.getAdyenApplePayMerchantIdentifier(), applePayExpressCartRequest.getAdyenApplePayMerchantName(),
                 applePayExpressCartRequest.getApplePayToken(), request);
 
-        autoLoginStrategy.login(userService.getCurrentUser().getUid(), null, request, response);
+        guidCookieStrategy.setCookie(request, response);
+        sessionService.setAttribute("anonymous_checkout", Boolean.TRUE);
 
         return new ResponseEntity<>(paymentsResponse, HttpStatus.OK);
     }
diff --git a/adyenv6core/resources/adyenv6core-spring.xml b/adyenv6core/resources/adyenv6core-spring.xml
index e4a5d3d8c..4a610dfa3 100644
--- a/adyenv6core/resources/adyenv6core-spring.xml
+++ b/adyenv6core/resources/adyenv6core-spring.xml
@@ -510,6 +510,5 @@
         <property name="zoneDeliveryModeService" ref="zoneDeliveryModeService"/>
         <property name="adyenCheckoutFacade" ref="adyenCheckoutFacade"/>
         <property name="cartConverter" ref="cartConverter"/>
-        <property name="userService" ref="userService"/>
     </bean>
 </beans>
diff --git a/adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenExpressCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenExpressCheckoutFacade.java
index 2ce65d9ed..6c92d7ba4 100644
--- a/adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenExpressCheckoutFacade.java
+++ b/adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenExpressCheckoutFacade.java
@@ -28,7 +28,6 @@
 import de.hybris.platform.servicelayer.dto.converter.Converter;
 import de.hybris.platform.servicelayer.i18n.CommonI18NService;
 import de.hybris.platform.servicelayer.model.ModelService;
-import de.hybris.platform.servicelayer.user.UserService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.validator.routines.EmailValidator;
@@ -58,7 +57,6 @@ public class DefaultAdyenExpressCheckoutFacade implements AdyenExpressCheckoutFa
     private DeliveryModeService deliveryModeService;
     private ZoneDeliveryModeService zoneDeliveryModeService;
     private AdyenCheckoutFacade adyenCheckoutFacade;
-    private UserService userService;
     private Converter<AddressData, AddressModel> addressReverseConverter;
     private Converter<CartModel, CartData> cartConverter;
 
@@ -71,7 +69,6 @@ public PaymentsResponse expressPDPCheckout(AddressData addressData, String produ
         }
 
         CustomerModel user = createGuestCustomer(addressData.getEmail());
-        userService.setCurrentUser(user);
 
         CartModel cart = createCartForExpressCheckout(user);
 
@@ -128,7 +125,6 @@ public PaymentsResponse expressPDPCheckout(AddressData addressData, String produ
     public PaymentsResponse expressCartCheckout(AddressData addressData, String merchantId, String merchantName,
                                                 String applePayToken, HttpServletRequest request) throws Exception {
         CustomerModel user = createGuestCustomer(addressData.getEmail());
-        userService.setCurrentUser(user);
         cartService.changeCurrentCartUser(user);
 
         CartModel cart = cartService.getSessionCart();
@@ -285,8 +281,4 @@ public void setAdyenCheckoutFacade(AdyenCheckoutFacade adyenCheckoutFacade) {
     public void setCartConverter(Converter<CartModel, CartData> cartConverter) {
         this.cartConverter = cartConverter;
     }
-
-    public void setUserService(UserService userService) {
-        this.userService = userService;
-    }
 }