Index: /mods/wpsg_mod_basic.class.php
===================================================================
--- /mods/wpsg_mod_basic.class.php	(revision 6802)
+++ /mods/wpsg_mod_basic.class.php	(revision 6803)
@@ -1073,4 +1073,5 @@
 				{
 						
+					$tax_netto = 0;
 					// Eventuell Nettopreis bestimmen
 					if ($this->shop->getBackendTaxview() == WPSG_BRUTTO)
@@ -1079,6 +1080,6 @@
 						$defaultCountry = $this->shop->getDefaultCountry();
 						$defaultTax = $defaultCountry->getTax(substr($tax_key, 0, 1));
-				
-						$tax_netto = wpsg_calculatePreis(($payment_price * $mw_anteil), WPSG_NETTO, $defaultTax); // * $mw_anteil;
+						if (!empty($payment_price))
+							$tax_netto = wpsg_calculatePreis(($payment_price * $mw_anteil), WPSG_NETTO, $defaultTax); // * $mw_anteil;
 				
 					}
Index: /views/mods/mod_onepagecheckout/onepage.phtml
===================================================================
--- /views/mods/mod_onepagecheckout/onepage.phtml	(revision 6802)
+++ /views/mods/mod_onepagecheckout/onepage.phtml	(revision 6803)
@@ -240,15 +240,15 @@
 						<?php echo wpsg_hspc(__($c['name'], 'wpsg')); ?><?php if ($c['show'] == '0') { ?> <span class="wpsg_required">*</span><?php } ?>:
 						<?php if ($c['typ'] == '0') { // Textfeld ?>
-						<input class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[checkout][custom][<?php echo $c_id; ?>]" type="text" value="<?php echo wpsg_hspc($this->view['basket']['checkout']['custom'][$c_id]); ?>" />
+						<input class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[checkout][custom][<?php echo $c_id; ?>]" type="text" value="<?php if (isset($this->view['basket']['checkout']['custom'][$c_id])) echo wpsg_hspc($this->view['basket']['checkout']['custom'][$c_id]); ?>" />
 						<?php } else if ($c['typ'] == '1') { $arAuswahl = explode("|", $c['auswahl']); // Auswahlfeld ?>
 						<select class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[checkout][custom][<?php echo $c_id; ?>]">
 							<option value="-1"><?php echo __('Bitte AuswÀhlen', 'wpsg'); ?></option>
 							<?php foreach ((array)$arAuswahl as $a) { ?>
-							<option value="<?php echo wpsg_hspc($a); ?>" <?php echo (($a == $this->view['basket']['checkout']['custom'][$c_id])?'selected="selected"':''); ?>><?php echo wpsg_hspc($a); ?></option>
+							<option value="<?php echo wpsg_hspc($a); ?>" <?php if (isset($this->view['basket']['checkout']['custom'][$c_id])) echo (($a == $this->view['basket']['checkout']['custom'][$c_id])?'selected="selected"':''); ?>><?php echo wpsg_hspc($a); ?></option>
 							<?php } ?>
 						</select>
 						<?php } else if ($c['typ'] == '2') { // Checkbox ?>
 						<input type="hidden" name="wpsg[checkout][custom][<?php echo $c_id; ?>]" value="0" />
-						<input class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> checkbox" type="checkbox" value="1" name="wpsg[checkout][custom][<?php echo $c_id; ?>]" value="1" <?php echo wpsg_hspc(($this->view['basket']['checkout']['custom'][$c_id] == '1')?'checked="checked"':''); ?> />
+						<input class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> checkbox" type="checkbox" value="1" name="wpsg[checkout][custom][<?php echo $c_id; ?>]" value="1" <?php if(isset($this->view['basket']['checkout']['custom'][$c_id])) echo wpsg_hspc(($this->view['basket']['checkout']['custom'][$c_id] == '1')?'checked="checked"':''); ?> />
 						<?php } ?>
 					</label>
@@ -416,6 +416,9 @@
 			<?php } ?>			
 
+			land = <?php if (wpsg_isSizedInt($this->view['basket']['checkout']['land'])) echo $this->view['basket']['checkout']['land'];
+					else echo $this->get_option('wpsg_defaultland'); ?>;
+				
 			// Land der Rechnungsadresse setzen
-			land = jQuery('#set_land').val();
+			//land = jQuery('#set_land').val();
 			jQuery('#wpsg_land').val(land);
 			//alert('land: ' + land);
Index: /views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
===================================================================
--- /views/mods/mod_shippingadress/checkout_inner_prebutton.phtml	(revision 6802)
+++ /views/mods/mod_shippingadress/checkout_inner_prebutton.phtml	(revision 6803)
@@ -73,5 +73,5 @@
 				
 			<div class="wpsg_checkoutblock">
-				<label for="wpsg_land" class="wpsg_checkout"><?php echo __("Land:", "wpsg"); ?>
+				<label for="shipping_land" class="wpsg_checkout"><?php echo __("Land:", "wpsg"); ?>
 					<?php if ($this->view['pflicht']['land'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 				</label>					
@@ -121,4 +121,8 @@
 					
 					view_checkout_shippingadresss();
+
+					land = <?php if (wpsg_isSizedInt($this->view['basket']['checkout']['land'])) echo $this->view['basket']['checkout']['land'];
+					else echo $this->get_option('wpsg_defaultland'); ?>;
+					jQuery('#shipping_land').val(land);
 					
 				});