Index: /controller/wpsg_BasketController.class.php
===================================================================
--- /controller/wpsg_BasketController.class.php	(revision 7723)
+++ /controller/wpsg_BasketController.class.php	(revision 7725)
@@ -70,9 +70,19 @@
 			
 			$array_keys_shipping = array_keys($this->shop->arShipping);
-			if (sizeof($this->shop->arShipping) == 1) $_SESSION['wpsg']['checkout']['shipping'] = $array_keys_shipping[0];
+			if (sizeof($this->shop->arShipping) === 1 || !in_array($_SESSION['wpsg']['checkout']['shipping'], $array_keys_shipping)) {
+
+			    $_SESSION['wpsg']['checkout']['shipping'] = $array_keys_shipping[0];
+                $this->shop->view['basket']['checkout']['shipping'] = $array_keys_shipping[0];
+
+            }
 			
 			$array_keys_payment = array_keys($this->shop->arPayment);
-			if (sizeof($this->shop->arPayment) == 1) $_SESSION['wpsg']['checkout']['payment'] = $array_keys_payment[0];
-			
+			if (sizeof($this->shop->arPayment) === 1 || !in_array($_SESSION['wpsg']['checkout']['payment'], $array_keys_payment)) {
+
+			    $_SESSION['wpsg']['checkout']['payment'] = $array_keys_payment[0];
+                $this->shop->view['basket']['checkout']['payment'] = $array_keys_payment[0];
+
+            }
+
 			if (sizeof($this->shop->arShipping) == 1 || sizeof($this->shop->arPayment) == 1) {
 				
@@ -81,5 +91,5 @@
 				
 			}
-			
+
 			// Zur Sicherheit ÃŒberprÃŒfe ich hier noch einmal die Zahlungsarten
 			// Es kann vorkommen, das eine Zahlungsart voreingestellt ist die nicht mehr verfÃŒgbar ist
@@ -99,5 +109,5 @@
 			$this->shop->view['colspan'] = 3;
 			if ($this->get_option('wpsg_showMwstAlways') == '1' || sizeof($this->shop->view['basket']['mwst']) > 1) $this->shop->view['colspan'] ++;
-			
+
 			if ($this->shop->hasMod('wpsg_mod_onepagecheckout') && ($this->get_option('wpsg_mod_onepagecheckout_basket') == 1)) {
 				
@@ -274,5 +284,5 @@
 		 */
 		private function overviewAction(&$content) {
-			
+
 			if (!isset($this->_outputCache['overview'])) {