Index: /mods/wpsg_mod_creditcard.class.php
===================================================================
--- /mods/wpsg_mod_creditcard.class.php	(revision 7437)
+++ /mods/wpsg_mod_creditcard.class.php	(revision 7440)
@@ -78,6 +78,15 @@
 			
 			//if (!is_admin() && $this->shop->get_option('wpsg_mod_creditcard_aktiv') != '1') return;
-			if (is_admin() || $this->shop->get_option('wpsg_mod_targo_aktiv') == '1') {
-				
+			if (is_admin() || $this->shop->get_option('wpsg_mod_creditcard_aktiv') == '1') {
+				
+				$this->shop->view['wpsg_mod_creditcard'] = [
+					'typ' => ($_SESSION['wpsg']['checkout']['mod_creditcard_typ']??'VISA'),
+					'inhaber' => ($_SESSION['wpsg']['checkout']['mod_creditcard_inhaber']??''),
+					'knr' => ($_SESSION['wpsg']['checkout']['mod_creditcard_knr']??''),
+					'pruefz' => ($_SESSION['wpsg']['checkout']['mod_creditcard_pruefz']??''),
+					'gueltigm' => ($_SESSION['wpsg']['checkout']['mod_creditcard_gueltigm']??''),
+					'gueltigj' => ($_SESSION['wpsg']['checkout']['mod_creditcard_gueltigj']??'')
+				];
+				 
 				$arPayment[$this->id] = array(
 					'id' => $this->id,
@@ -86,5 +95,6 @@
 					'tax_key' => $this->shop->get_option('wpsg_mod_creditcard_mwst'),
 					'mwst_null' => $this->shop->get_option('wpsg_mod_creditcard_mwstland'),
-					'hint' => __($this->shop->get_option('wpsg_mod_creditcard_hint')),
+					//'hint' => __($this->shop->get_option('wpsg_mod_creditcard_hint')),
+					'hint' => $this->shop->render(WPSG_PATH_VIEW.'mods/mod_creditcard/paymenthint.phtml', false),
 					'logo' => $this->shop->getRessourceURL('mods/mod_creditcard/gfx/logo_100x25.png')
 				);
Index: /views/mods/mod_creditcard/paymenthint.phtml
===================================================================
--- /views/mods/mod_creditcard/paymenthint.phtml	(revision 7437)
+++ /views/mods/mod_creditcard/paymenthint.phtml	(revision 7440)
@@ -19,6 +19,6 @@
 			<select name="wpsg_mod_creditcard[typ]" id="wpsg_mod_creditcard_typ" 
 			class="<?php echo ((in_array('mod_creditcard_typ', (array)$this->view['error']))?'wpsg_error':''); ?>" >
-				<option value="VISA" selected="selected">VISA</option>
-				<option value="MasterCard" >MasterCard</option>
+				<option value="VISA" <?php echo (($this->view['wpsg_mod_creditcard']['typ'] === 'VISA')?'selected="selected"':''); ?>>VISA</option>
+				<option value="MasterCard" <?php echo (($this->view['wpsg_mod_creditcard']['typ'] === 'MasterCard')?'selected="selected"':''); ?>>MasterCard</option>
 			</select>