Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 5878)
+++ /controller/wpsg_ShopController.class.php	(revision 5879)
@@ -2532,8 +2532,12 @@
 			if (isset($_REQUEST['wpsg']['checkout']['shipping_land'])) $_SESSION['wpsg']['checkout']['shipping_land'] = $_REQUEST['wpsg']['checkout']['shipping_land'];
 			if (isset($_REQUEST['wpsg']['checkout']['land'])) $_SESSION['wpsg']['checkout']['land'] = $_REQUEST['wpsg']['checkout']['land'];
-			
-			$this->addShipPay();
-			
-			$this->basket->initFromSession();
+					
+			if (!is_admin())
+			{
+			
+				$this->basket->initFromSession();			
+				$this->addShipPay();
+				
+			}
 						
 			if (!is_admin())
@@ -2571,5 +2575,5 @@
 		{
 			
-			$this->addShipPay();
+			if (is_admin()) $this->addShipPay();
 				
 			load_plugin_textdomain('wpsg', false, dirname( plugin_basename( __FILE__ ) ).'/../lang/');