Index: /mods/wpsg_mod_kundenverwaltung.class.php
===================================================================
--- /mods/wpsg_mod_kundenverwaltung.class.php	(revision 6873)
+++ /mods/wpsg_mod_kundenverwaltung.class.php	(revision 6874)
@@ -836,20 +836,20 @@
 					$adata = Array();
 					$adata['cdate'] = 'NOW()';
-					$adata['title'] = $kunde_data['title'];
-					$adata['name'] = $kunde_data['name'];
-					$adata['vname'] = $kunde_data['vname'];
-					$adata['firma'] = $kunde_data['firma'];
-					$adata['fax'] = $kunde_data['fax'];
-					$adata['strasse'] = $kunde_data['strasse'];
+					$adata['title'] = wpsg_getStr($kunde_data['title']);
+					$adata['name'] = wpsg_getStr($kunde_data['name']);
+					$adata['vname'] = wpsg_getStr($kunde_data['vname']);
+					$adata['firma'] = wpsg_getStr($kunde_data['firma']);
+					$adata['fax'] = wpsg_getStr($kunde_data['fax']);
+					$adata['strasse'] = wpsg_getStr($kunde_data['strasse']);
 					$adata['nr'] = wpsg_getStr($kunde_data['nr']);
-					$adata['plz'] = $kunde_data['plz'];
-					$adata['ort'] = $kunde_data['ort'];
-					$adata['land'] = $kunde_data['land'];
-					$adata['tel'] = $kunde_data['tel'];
+					$adata['plz'] = wpsg_getStr($kunde_data['plz']);
+					$adata['ort'] = wpsg_getStr($kunde_data['ort']);
+					$adata['land'] = wpsg_getStr($kunde_data['land']);
+					$adata['tel'] = wpsg_getStr($kunde_data['tel']);
 					
 					$kdata = Array();
-					$kdata['email'] = $kunde_data['email'];
-					$kdata['ustidnr'] = $kunde_data['ustidnr'];
-					$kdata['geb'] = $kunde_data['geb'];
+					$kdata['email'] = wpsg_getStr($kunde_data['email']);
+					$kdata['ustidnr'] = wpsg_getStr($kunde_data['ustidnr']);
+					$kdata['geb'] = wpsg_getStr($kunde_data['geb']);
 					$kdata['id'] = $kunde_data['id'];
 					$kdata['passwort_saltmd5'] = $kunde_data['passwort_saltmd5'];
@@ -974,15 +974,15 @@
 					
 					$adata['cdate'] = 'NOW()';
-					$adata['title'] = $kunde_data['title']; unset($kunde_data['title']);
-					$adata['name'] = $kunde_data['name']; unset($kunde_data['name']);
-					$adata['vname'] = $kunde_data['vname']; unset($kunde_data['vname']);
-					$adata['firma'] = $kunde_data['firma']; unset($kunde_data['firma']);
-					$adata['fax'] = $kunde_data['fax']; unset($kunde_data['fax']);
-					$adata['strasse'] = $kunde_data['strasse']; unset($kunde_data['strasse']);
+					$adata['title'] = wpsg_getStr($kunde_data['title']); unset($kunde_data['title']);
+					$adata['name'] = wpsg_getStr($kunde_data['name']); unset($kunde_data['name']);
+					$adata['vname'] = wpsg_getStr($kunde_data['vname']); unset($kunde_data['vname']);
+					$adata['firma'] = wpsg_getStr($kunde_data['firma']); unset($kunde_data['firma']);
+					$adata['fax'] = wpsg_getStr($kunde_data['fax']); unset($kunde_data['fax']);
+					$adata['strasse'] = wpsg_getStr($kunde_data['strasse']); unset($kunde_data['strasse']);
 					$adata['nr'] = wpsg_getStr($kunde_data['nr']); unset($kunde_data['nr']);
-					$adata['plz'] = $kunde_data['plz']; unset($kunde_data['plz']);
-					$adata['ort'] = $kunde_data['ort']; unset($kunde_data['ort']);
-					$adata['land'] = $kunde_data['land']; unset($kunde_data['land']);
-					$adata['tel'] = $kunde_data['tel']; unset($kunde_data['tel']);
+					$adata['plz'] = wpsg_getStr($kunde_data['plz']); unset($kunde_data['plz']);
+					$adata['ort'] = wpsg_getStr($kunde_data['ort']); unset($kunde_data['ort']);
+					$adata['land'] = wpsg_getStr($kunde_data['land']); unset($kunde_data['land']);
+					$adata['tel'] = wpsg_getStr($kunde_data['tel']); unset($kunde_data['tel']);
 					
 					$a = $this->db->fetchRow("
Index: /views/mods/mod_kundenverwaltung/login.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/login.phtml	(revision 6873)
+++ /views/mods/mod_kundenverwaltung/login.phtml	(revision 6874)
@@ -41,5 +41,5 @@
 
 	<?php
-
+	/*
 		$this->view['data'] = $_SESSION['wpsg']['checkout'];
 		$this->view['error'] = $_SESSION['wpsg']['errorFields'];
@@ -50,5 +50,5 @@
 
 		echo $this->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/register.phtml', false);
-
+	*/
 	?>
 
Index: /views/mods/mod_kundenverwaltung/profil.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/profil.phtml	(revision 6873)
+++ /views/mods/mod_kundenverwaltung/profil.phtml	(revision 6874)
@@ -124,4 +124,5 @@
 		<h2><?php echo __('Kundendaten', 'wpsg'); ?></h2>
 		
+		<?php if ($this->view['pflicht']['firma'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="wpsg_firma"><?php echo __("Firma", "wpsg"); ?>
@@ -130,5 +131,7 @@
 			<input class="<?php echo (($this->view['pflicht']['firma'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("firma", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_firma" name="wpsg[profil][firma]" value="<?php echo htmlspecialchars($this->view['data']['firma']); ?>" />
 		</div>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['anrede'] != '2') { ?>
 		<div class="wpsg_checkoutblock">		
 			<label for="wpsg_title"><?php echo __('Anrede', 'wpsg'); ?>
@@ -138,8 +141,10 @@
 				<?php $i=0; foreach (explode("|", $this->view['pflicht']['anrede_auswahl']) as $t) { ?>
 				<option value="<?php echo $i; /*wpsg_hspc($t);*/ $i++; ?>" <?php echo (($this->view['data']['title'] == $t)?'selected="selected"':''); ?>><?php echo $t; ?></option>
-				<?php } ?>						
-			</select>		
-		</div>
-		
+				<?php } ?>
+			</select>
+		</div>
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['vname'] != '2') { ?>
 		<div class="wpsg_checkoutblock">		
 			<label for="vname" class="wpsg_checkout"><?php echo __("Vorname", "wpsg"); ?> 
@@ -148,5 +153,7 @@
 			<input class="<?php echo (($this->view['pflicht']['vname'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="vname" name="wpsg[profil][vname]" value="<?php echo htmlspecialchars($this->view['data']['vname']); ?>" />
 		</div>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['name'] != '2') { ?>
 		<div class="wpsg_checkoutblock">		
 			<label for="name" class="wpsg_checkout"><?php echo __("Name", "wpsg"); ?>
@@ -155,5 +162,7 @@
 			<input class="<?php echo (($this->view['pflicht']['name'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="name" name="wpsg[profil][name]" value="<?php echo htmlspecialchars($this->view['data']['name']); ?>" />
 		</div>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['geb'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="geb" class="wpsg_checkout"><?php echo __('Geburtsdatum (Format: TT.MM.JJJJ)', 'wpsg'); ?>
@@ -162,5 +171,7 @@
 			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['geb'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("geb", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="geb" name="wpsg[profil][geb]" value="<?php echo htmlspecialchars($this->view['data']['geb']); ?>" />
 		</div>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['email'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="email" class="wpsg_checkout"><?php echo __("E-Mail Adresse", "wpsg"); ?> 
@@ -169,7 +180,7 @@
 			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email" name="wpsg[profil][email]" value="<?php echo htmlspecialchars($this->view['data']['email']); ?>" />		
 		</div>
+		<?php } ?>
 		
 		<?php if ($this->view['pflicht']['emailconfirm'] == '1') { ?>
-		
 		<div class="wpsg_checkoutblock">
 			<label for="email" class="wpsg_checkout"><?php echo __("E-Mail Adresse (Wiederholung)", "wpsg"); ?> 
@@ -178,7 +189,7 @@
 			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email2" name="wpsg[profil][email2]" value="<?php echo htmlspecialchars($this->view['data']['email2']); ?>" />			
 		</div>
-		
-		<?php } ?>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['fax'] != '2') { ?>
 		<div class="wpsg_checkoutblock">		
 			<label for="fax" class="wpsg_checkout"><?php echo __("Fax.", "wpsg"); ?>
@@ -187,5 +198,7 @@
 			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['fax'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("fax", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="fax" name="wpsg[profil][fax]" value="<?php echo htmlspecialchars($this->view['data']['fax']); ?>" />		
 		</div>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['tel'] != '2') { ?>
 		<div class="wpsg_checkoutblock">		
 			<label for="tel" class="wpsg_checkout"><?php echo __("Tel.", "wpsg"); ?>
@@ -194,5 +207,7 @@
 			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['tel'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("tel", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="tel" name="wpsg[profil][tel]" value="<?php echo htmlspecialchars($this->view['data']['tel']); ?>" />	
 		</div>
-				
+		<?php } ?>
+				
+		<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
 		<div class="wpsg_checkoutblock">			
 			<label for="strasse" class="wpsg_checkout"><?php echo __("Straße Nr.", "wpsg"); ?> 
@@ -201,5 +216,7 @@
 			<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[profil][strasse]" value="<?php echo htmlspecialchars($this->view['data']['strasse']); ?>" />		
 		</div>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['plz'] != '2') { ?>
 		<div class="wpsg_checkoutblock">		
 			<label for="plz" class="wpsg_checkout"><?php echo __("Postleitzahl", "wpsg"); ?> 
@@ -208,5 +225,7 @@
 			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['plz'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="plz" name="wpsg[profil][plz]" value="<?php echo htmlspecialchars($this->view['data']['plz']); ?>" />		
 		</div>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['ort'] != '2') { ?>
 		<div class="wpsg_checkoutblock">		
 			<label for="ort" class="wpsg_checkout"><?php echo __("Ort", "wpsg"); ?> 
@@ -215,5 +234,7 @@
 			<input class="<?php echo (($this->view['pflicht']['ort'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="ort" name="wpsg[profil][ort]" value="<?php echo htmlspecialchars($this->view['data']['ort']); ?>" />		
 		</div>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['land'] != '2') { ?>
 		<div class="wpsg_checkoutblock">		
 			<label for="wpsg_land" class="wpsg_checkout"><?php echo __("Land", "wpsg"); ?> 
@@ -227,5 +248,7 @@
 			</select>		
 		</div>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['ustidnr'] != '2') { ?>
 		<div class="wpsg_checkoutblock">		
 			<label for="wpsg_ustidnr" class="wpsg_checkout"><?php echo __("UStIdNr.", "wpsg"); ?> 
@@ -234,4 +257,5 @@
 			<input class="<?php echo (($this->view['pflicht']['ustidnr'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ustidnr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_ustidnr" name="wpsg[profil][ustidnr]" value="<?php echo htmlspecialchars($this->view['data']['ustidnr']); ?>" />		
 		</div>
+		<?php } ?>
 		
 		<?php /* Automatische Einbindung der benutzerdefinierten Felder */ ?>
Index: /views/mods/mod_kundenverwaltung/register.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/register.phtml	(revision 6873)
+++ /views/mods/mod_kundenverwaltung/register.phtml	(revision 6874)
@@ -137,4 +137,5 @@
 	<form id="form-step2" method="post" action="<?php echo $this->callMod('wpsg_mod_kundenverwaltung', 'getRegisterURL'); ?>">
 	
+		<?php if ($this->view['pflicht']['firma'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="wpsg_firma"><?php echo __("Firma", "wpsg"); ?>
@@ -143,5 +144,7 @@
 			<input class="<?php echo (($this->view['pflicht']['firma'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("firma", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_firma" name="wpsg[register][firma]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['firma'])); ?>" />
 		</div>
-	
+		<?php } ?>
+	
+		<?php if ($this->view['pflicht']['anrede'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="wpsg_title"><?php echo __('Anrede', 'wpsg'); ?>
@@ -154,5 +157,7 @@
 			</select>
 		</div>
-	
+		<?php } ?>
+	
+		<?php if ($this->view['pflicht']['vname'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="vname" class="wpsg_register"><?php echo __("Vorname", "wpsg"); ?>
@@ -161,5 +166,7 @@
 			<input class="<?php echo (($this->view['pflicht']['vname'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="vname" name="wpsg[register][vname]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['vname'])); ?>" />		
 		</div>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['name'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="name" class="wpsg_register"><?php echo __("Name", "wpsg"); ?>
@@ -168,5 +175,7 @@
 			<input class="<?php echo (($this->view['pflicht']['name'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="name" name="wpsg[register][name]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['name'])); ?>" />
 		</div>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['email'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="email" class="wpsg_register"><?php echo __("E-Mail Adresse", "wpsg"); ?>
@@ -175,5 +184,7 @@
 			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email" name="wpsg[register][email]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['email'])); ?>" />
 		</div>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['email'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="email" class="wpsg_register"><?php echo __("E-Mail Adresse (Wiederholung)", "wpsg"); ?>
@@ -182,4 +193,5 @@
 			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email2" name="wpsg[register][email2]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['register']['email2'])); ?>" />
 		</div>
+		<?php } ?>
 		
 		<div class="wpsg_checkoutblock">
@@ -208,4 +220,5 @@
 		</div>
 		
+		<?php if ($this->view['pflicht']['geb'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="geb" class="wpsg_register"><?php echo __('Geburtsdatum (Format: TT.MM.JJJJ)', 'wpsg'); ?>
@@ -214,5 +227,7 @@
 			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['geb'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("geb", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="geb" name="wpsg[register][geb]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['geb'])); ?>" />
 		</div>
-				
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['fax'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="fax" class="wpsg_register"><?php echo __("Fax.", "wpsg"); ?>
@@ -221,5 +236,7 @@
 			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['fax'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("fax", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="fax" name="wpsg[register][fax]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['fax'])); ?>" />
 		</div>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['tel'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="tel" class="wpsg_register"><?php echo __("Tel.", "wpsg"); ?>
@@ -228,5 +245,7 @@
 			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['tel'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("tel", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="tel" name="wpsg[register][tel]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['tel'])); ?>" />
 		</div>
-	
+		<?php } ?>
+	
+		<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="strasse" class="wpsg_register"><?php echo __("Straße Nr.", "wpsg"); ?>
@@ -235,5 +254,7 @@
 			<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[register][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['strasse'])); ?>" />		
 		</div>
-	
+		<?php } ?>
+	
+		<?php if ($this->view['pflicht']['plz'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="plz" class="wpsg_register"><?php echo __("Postleitzahl", "wpsg"); ?>
@@ -242,5 +263,7 @@
 			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['plz'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="plz" name="wpsg[register][plz]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['plz'])); ?>" />
 		</div>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['ort'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="ort" class="wpsg_register"><?php echo __("Ort", "wpsg"); ?>
@@ -249,5 +272,7 @@
 			<input class="<?php echo (($this->view['pflicht']['ort'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="ort" name="wpsg[register][ort]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['ort'])); ?>" />
 		</div>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['land'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="wpsg_land" class="wpsg_register"><?php echo __("Land", "wpsg"); ?>
@@ -261,5 +286,7 @@
 			</select>
 		</div>
-		
+		<?php } ?>
+		
+		<?php if ($this->view['pflicht']['ustidnr'] != '2') { ?>
 		<div class="wpsg_checkoutblock">
 			<label for="wpsg_ustidnr" class="wpsg_register"><?php echo __("UStIdNr.", "wpsg"); ?>
@@ -268,4 +295,5 @@
 			<input class="<?php echo (($this->view['pflicht']['ustidnr'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("ustidnr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_ustidnr" name="wpsg[register][ustidnr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['ustidnr'])); ?>" />
 		</div>
+		<?php } ?>
 		
 		<?php /* Automatische Einbindung der benutzerdefinierten Felder */ ?>
@@ -276,15 +304,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[register][custom][<?php echo $c_id; ?>]" type="text" value="<?php echo wpsg_hspc($this->view['data']['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[register][custom][<?php echo $c_id; ?>]" type="text" value="<?php echo wpsg_hspc(@$this->view['data']['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[register][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['data']['custom'][$c_id])?'selected="selected"':''); ?>><?php echo wpsg_hspc($a); ?></option>
+					<option value="<?php echo wpsg_hspc($a); ?>" <?php echo (($a == wpsg_getStr($this->view['data']['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[register][custom][<?php echo $c_id; ?>]" value="0" />
-				<input id="wpsg_cv_<?php echo $c_id; ?>" class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> checkbox" type="checkbox" value="1" name="wpsg[register][custom][<?php echo $c_id; ?>]" value="1" <?php echo wpsg_hspc(($this->view['data']['custom'][$c_id] == '1')?'checked="checked"':''); ?> />
+				<input id="wpsg_cv_<?php echo $c_id; ?>" class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> checkbox" type="checkbox" value="1" name="wpsg[register][custom][<?php echo $c_id; ?>]" value="1" <?php echo wpsg_hspc((@$this->view['data']['custom'][$c_id] == '1')?'checked="checked"':''); ?> />
 				<span class="wpsg_clear"></span> 
 				<?php } ?>