Index: /mods/wpsg_mod_abo.class.php
===================================================================
--- /mods/wpsg_mod_abo.class.php	(revision 7827)
+++ /mods/wpsg_mod_abo.class.php	(revision 7828)
@@ -527,6 +527,4 @@
             ");
 
-			// DATEDIFF(A.`expiration`, NOW()) = ".wpsg_q($this->shop->get_option('wpsg_mod_abo_autoexpire_informationtime'))." AND
-
             foreach ($arAboInformation as $a) {
 
@@ -549,11 +547,13 @@
                         ), "`id` = '".wpsg_q($a['id'])."'");
 
+                        $handledAboIDs[] = intval($a['id']);
+
                     } else if ($wpsg_mod_abo_expiremode === self::EXPIRE_AUTO) {
 
                     	$this->autoExtendOrder($a['order_id'], $a['order_product_id']);
 
+                    	$handledAboIDs[] = intval($a['id']);
+
                     }
-
-                    $handledAboIDs[] = intval($a['id']);
 
                 }
Index: /views/mods/mod_abo/settings_edit.phtml
===================================================================
--- /views/mods/mod_abo/settings_edit.phtml	(revision 7827)
+++ /views/mods/mod_abo/settings_edit.phtml	(revision 7828)
@@ -24,4 +24,5 @@
  
 <?php echo wpsg_drawForm_Select('wpsg_mod_abo_expiremode', __('Nach Ablauf des Abos', 'wpsg'), Array(
+    wpsg_mod_abo::EXPIRE_NONE => __('Nichts', 'wpsg'),
 	wpsg_mod_abo::EXPIRE_MAIL => __('Mail versenden', 'wpsg'),
 	wpsg_mod_abo::EXPIRE_AUTO => __('Automatisch verlÀngern', 'wpsg')