Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 6190)
+++ /lib/wpsg_basket.class.php	(revision 6191)
@@ -451,20 +451,27 @@
 		 * Löscht die Session
 		 */
-		public function clearSession()
+		public function clearSession($customer_id)
 		{
 			
-			if ($this->shop->get_option('wpsg_afterorder') == '1') unset($_SESSION['wpsg']);
+			$this->shop->callMods('clearSession');
+			
+			if ($this->shop->get_option('wpsg_afterorder') == '1')
+			{
+				
+				// Löschen
+				unset($_SESSION['wpsg']);
+				
+			}
 			else
 			{
 			
+				// In Session belassen
 				unset($_SESSION['wpsg']['basket']);
 				unset($_SESSION['wpsg']['gs']);
-			
-				$this->shop->callMods('clearSession');
-				
+			 				
 				if ($this->shop->hasMod('wpsg_mod_kundenverwaltung'))
 				{
 					
-					$this->shop->callMod('wpsg_mod_kundenverwaltung', 'login', array($_SESSION['wpsg']['checkout']['id']));
+					$this->shop->callMod('wpsg_mod_kundenverwaltung', 'login', array($customer_id));
 					
 				}
@@ -1039,5 +1046,5 @@
 					// Eintrag in die Kundentabelle
 					$kdata = array(
-							'invisible' => 0 	// 0=vollstÀndige Bestellung
+						'invisible' => 0 	// 0=vollstÀndige Bestellung
 					);
 					$this->db->UpdateQuery(WPSG_TBL_KU, $kdata, "`id` = '".wpsg_q($k_id)."'");
@@ -1049,5 +1056,5 @@
 					unset($_SESSION['wpsg']['checkout']['payer_id']);
 					
-					$this->clearSession();
+					$this->clearSession($k_id);
 					
 				}
Index: /mods/wpsg_mod_newsletter.class.php
===================================================================
--- /mods/wpsg_mod_newsletter.class.php	(revision 6190)
+++ /mods/wpsg_mod_newsletter.class.php	(revision 6191)
@@ -188,5 +188,10 @@
 		{
 			 
-			unset($_SESSION['wpsg']['wpsg_mod_newsletter']);
+			if ($this->shop->get_option('wpsg_afterorder') == '1')
+			{
+			
+				unset($_SESSION['wpsg']['wpsg_mod_newsletter']);
+				
+			}
 			
 		} // public function clearSession()
Index: /mods/wpsg_mod_nlsatolo.class.php
===================================================================
--- /mods/wpsg_mod_nlsatolo.class.php	(revision 6190)
+++ /mods/wpsg_mod_nlsatolo.class.php	(revision 6191)
@@ -139,5 +139,10 @@
 		{
 			 
-			unset($_SESSION['wpsg']['wpsg_mod_nlsatolo']);
+			if ($this->shop->get_option('wpsg_afterorder') == '1')
+			{
+			
+				unset($_SESSION['wpsg']['wpsg_mod_nlsatolo']);
+				
+			}
 			
 		} // public function clearSession()
Index: /mods/wpsg_mod_ordervars.class.php
===================================================================
--- /mods/wpsg_mod_ordervars.class.php	(revision 6190)
+++ /mods/wpsg_mod_ordervars.class.php	(revision 6191)
@@ -285,5 +285,10 @@
 		{ 
 			
-			unset($_SESSION['wpsg']['wpsg_mod_ordervars']);
+			if ($this->shop->get_option('wpsg_afterorder') == '1')
+			{
+				
+				unset($_SESSION['wpsg']['wpsg_mod_ordervars']);
+				
+			}
 			
 		}