Index: /controller/wpsg_BasketController.class.php
===================================================================
--- /controller/wpsg_BasketController.class.php	(revision 8118)
+++ /controller/wpsg_BasketController.class.php	(revision 8119)
@@ -947,4 +947,8 @@
 						$target_error = $this->shop->getURL(wpsg_ShopController::URL_CHECKOUT);
 						
+						$this->shop->checkShippingAvailable();
+						$this->shop->checkPaymentAvailable();            
+						$this->shop->checkCustomerPreset();
+						
 						if (array_key_exists($this->shop->basket->arCheckout['shipping'], $this->shop->arShipping) && array_key_exists($this->shop->basket->arCheckout['payment'], $this->shop->arPayment) && $this->shop->get_option('wpsg_skip_checkout2') === '1' && $this->shop->basket->arCheckout['payment'] != 20) {