diff --git a/themes/easyshop_advanced/templates/content_cash_desk.tpl b/themes/easyshop_advanced/templates/content_cash_desk.tpl
index f521d25..da9be36 100644
--- a/themes/easyshop_advanced/templates/content_cash_desk.tpl
+++ b/themes/easyshop_advanced/templates/content_cash_desk.tpl
@@ -1,160 +1,165 @@
-<!-- template content_cash_desk.tpl -->
-
-{if $error_message}
-	{foreach from=$error_message item=message}
-		<div style="font-weight:bold;font-size:14px;color:#cc0000;border:#cc0000 1px solid;padding:10px;text-align:center;">
-			{$message}
-		</div>
-		<br />
-	{/foreach}
-{/if}
-
-{if $customer_data->burth_date == '0000-00-00'}
-	<div id="need_customer_burth_date" style="font-weight:bold;font-size:14px;color:#cc0000;border:#cc0000 1px solid;padding:10px;text-align:center;display:none;">
-		ACHTUNG!:<br>
-		Die Zahlungsart Klarna ben&ouml;tigt Ihr Geburtsdatum. Dieses k&ouml;nnen Sie in Ihren Kontoeinstellungen setzten -> <a href="/Kundencenter/">Kundencenter</a>
-	</div>
-{/if}
-
-<div class="cashdesk">
-	{if isset($guest_order) && $guest_order == 1}<div class="dropdown_title"><span class="info" style="font-size:22px;">Gastbestellung</span></div><br /><br />{/if}
-	{if isset($express_active) && $express_active}
-	<div class="info_box" style="border:1px solid #b8d6a8; background:#eef8e8; padding:10px 14px; margin-bottom:14px;">
-		<strong>Express-Kauf:</strong> Adresse, E-Mail und Zahlart wurden von {$express_label|escape} &uuml;bernommen.
-		Bitte pr&uuml;fen Sie die Angaben und schlie&szlig;en Sie die Bestellung unten ab &ndash; die Zahlung wird erst dann eingezogen.
-	</div>
-	{/if}
-	<form id="order_form" method="post" action="">
-		{include file='content_cash_desk/address_invoice.tpl'}
-		<br />
-		{include file='content_cash_desk/address_shipping.tpl'}
-		<br />
-		{if $system_configuration.shoppingcart_ordertext == 1}
-			{include file='content_cash_desk/customer_info.tpl'}
-		{/if}
-		<br />
-		{include file='content_cash_desk/payments.tpl'}
-		<br />
-		{include file='content_cash_desk/shipping.tpl'}
-		<br />
-		{include file='content_cash_desk/agreements.tpl'}
-		<br />
-		{include file='content_cash_desk/shoppingcart.tpl'}
-		<br />
-
-		<input type="hidden" id="cashdesk_action" name="cashdesk_action" value="" />
-
-		{* 25.08.2026: Kennung dieses Bestellvorgangs. Wird derselbe Wert ein zweites Mal
-		   abgeschickt (Doppelklick, Zurueck-Taste, zweiter Tab), erkennt
-		   website_cashdesk::bestellvorgang_bereits_erledigt() das und legt keine zweite
-		   Bestellung an, sondern fuehrt zum Ergebnis des ersten Versuchs zurueck. *}
-		<input type="hidden" name="checkout_nonce" value="{$checkout_nonce|escape}" />
-
-	</form>
-</div>
-
-
-<script type="text/javascript">
-
-{if !isset($guest_order) || (!$guest_order && $addresses)}
-	var addresses = new Array();
-
-	{foreach from=$addresses key=num item=address}
-	addresses[{$num}] = {literal} { {/literal}
-		company: '{$address->company}',
-		honorific: '{$address->honorific}',
-		firstname: '{$address->firstname}',
-		surname: '{$address->surname}',
-		street: '{$address->street}',
-		house_number: '{$address->house_number}',
-		zip_code: '{$address->zip_code}',
-		city: '{$address->city}',
-		country: '{$address->country}'
-	{literal} } {/literal};
-	{/foreach}
-{else}
-	var addresses = undefined;
-{/if}
-
-{if isset($guest_order) && $guest_order == 1}
-{literal}
-	$('#send_order_button').click(function(e) {
-		e.preventDefault();
-
-		if ($('#guest_order_email').val() == '' || 
-			$('#billing_honorific').val() == '' || 
-			(($('#billing_honorific').val() == '0' || $('#billing_honorific').val() == 1) && ( $('#billing_firstname').val() == '' ||  $('#billing_surname').val() == '')) ||
-			($('#billing_honorific').val() == 2 && $('#billing_company').val() == '') ||
-			$('#billing_zip_code').val() == '' || 
-			$('#billing_city').val() == '' || 
-			$('#billing_street').val() == '' || 
-			$('#billing_phone').val() == '' || 
-			$('#billing_house_number').val() == ''
-		) {
-			alert('Bitte geben Sie eine vollständige Rechnungsadresse an!');
-		}
-		else if ($('#shipping_address_select').val() != -1 && 
-				(
-					$('#shipping_honorific').val() == '' || 
-					(($('#shipping_honorific').val() == '0' || $('#shipping_honorific').val() == 1) && ( $('#shipping_firstname').val() == '' ||  $('#shipping_surname').val() == '')) ||
-					($('#shipping_honorific').val() == 2 && $('#shipping_company').val() == '') ||
-					$('#shipping_zip_code').val() == '' || 
-					$('#shipping_city').val() == '' || 
-					$('#shipping_street').val() == '' || 
-					$('#shipping_house_number').val() == ''
-				)
-		) {
-			alert('Bitte geben Sie eine vollständige Lieferadresse an!');
-		}
-                else if(!$('#agreements_accepted').attr('checked') || !($('#klarna_agreements_info').css('display') == 'none' || $('#klarna_agreements_accepted').attr('checked'))){
-			alert("Sie müssen unsere AGB's bestätigen!");
-		}
-		else {		
-			$('#cashdesk_action').val('ready2fly');
-			$('#order_form').submit();
-		}
-
-	});
-
-        
-	$(document).ready(function() {
-
-	$('#bill_country, #shipping_country').change(function(e) {
-		$('#cashdesk_action').val('reload');
-		$('#order_form').submit();
-	});
-
-
-
-});
-{/literal}
-{else}
-{literal}
-	$('#send_order_button').click(function(e) {
-		e.preventDefault();
-		if ($('#billing_address_select').val() == '') {
-			//alert('Bitte geben Sie eine vollständige Rechnungsadresse an!');
-			alert('Sie haben noch nicht Ihre neue Rechnungsadresse abgespeichert. Der Button "Daten speichern" befindet sich oben beim Adressreld! Durch die Änderung erfolgt eine neue Bezahlkostenberechnung.');
-		}
-		else if ($('#shipping_address_select').val() == '') {
-			//alert('Bitte geben Sie eine vollständige Lieferadresse an!');
-			alert('Sie haben noch nicht Ihre neue Lieferadresse abgespeichert. Der Button "Daten speichern" befindet sich oben beim Adressreld! Durch die Änderung erfolgt eine neue Versandkostenberechnung.');
-		}
-                else if($('#customer_order_email').length && $('#customer_order_email').val() == ''){
-			alert("Bitte geben Sie eine E-Mail Adresse ein!");
-		}
-                else if(!$('#agreements_accepted').attr('checked') || !($('#klarna_agreements_info').css('display') == 'none' || $('#klarna_agreements_accepted').attr('checked'))){
-			alert("Sie müssen unsere AGB's bestätigen!");
-		}
-		else {		
-			$('#cashdesk_action').val('ready2fly');
-			$('#order_form').submit();
-		}
-
-	});
-{/literal}
-{/if}
-
-</script>
-
-<script src="{$PARENT_THEME_DIR}/media/js/content_cash_desk.js?version=1" type="text/javascript"></script>
+<!-- template content_cash_desk.tpl -->
+
+{if $error_message}
+	{foreach from=$error_message item=message}
+		<div style="font-weight:bold;font-size:14px;color:#cc0000;border:#cc0000 1px solid;padding:10px;text-align:center;">
+			{$message}
+		</div>
+		<br />
+	{/foreach}
+{/if}
+
+{if $customer_data->burth_date == '0000-00-00'}
+	<div id="need_customer_burth_date" style="font-weight:bold;font-size:14px;color:#cc0000;border:#cc0000 1px solid;padding:10px;text-align:center;display:none;">
+		ACHTUNG!:<br>
+		Die Zahlungsart Klarna ben&ouml;tigt Ihr Geburtsdatum. Dieses k&ouml;nnen Sie in Ihren Kontoeinstellungen setzten -> <a href="/Kundencenter/">Kundencenter</a>
+	</div>
+{/if}
+
+<div class="cashdesk">
+	{if isset($guest_order) && $guest_order == 1}<div class="dropdown_title"><span class="info" style="font-size:22px;">Gastbestellung</span></div><br /><br />{/if}
+	{if isset($express_active) && $express_active}
+	<div class="info_box" style="border:1px solid #b8d6a8; background:#eef8e8; padding:10px 14px; margin-bottom:14px;">
+		<strong>Express-Kauf:</strong> Adresse, E-Mail und Zahlart wurden von {$express_label|escape} &uuml;bernommen.
+		Bitte pr&uuml;fen Sie die Angaben und schlie&szlig;en Sie die Bestellung unten ab &ndash; die Zahlung wird erst dann eingezogen.
+	</div>
+	{/if}
+	<form id="order_form" method="post" action="">
+		{include file='content_cash_desk/address_invoice.tpl'}
+		<br />
+		{include file='content_cash_desk/address_shipping.tpl'}
+		<br />
+		{if $system_configuration.shoppingcart_ordertext == 1}
+			{include file='content_cash_desk/customer_info.tpl'}
+		{/if}
+		<br />
+		{include file='content_cash_desk/payments.tpl'}
+		<br />
+		{include file='content_cash_desk/shipping.tpl'}
+		<br />
+		{include file='content_cash_desk/agreements.tpl'}
+		<br />
+		{include file='content_cash_desk/shoppingcart.tpl'}
+		<br />
+
+		<input type="hidden" id="cashdesk_action" name="cashdesk_action" value="" />
+
+		{* 25.08.2026: Kennung dieses Bestellvorgangs. Wird derselbe Wert ein zweites Mal
+		   abgeschickt (Doppelklick, Zurueck-Taste, zweiter Tab), erkennt
+		   website_cashdesk::bestellvorgang_bereits_erledigt() das und legt keine zweite
+		   Bestellung an, sondern fuehrt zum Ergebnis des ersten Versuchs zurueck. *}
+		<input type="hidden" name="checkout_nonce" value="{$checkout_nonce|escape}" />
+
+	</form>
+</div>
+
+
+<script type="text/javascript">
+
+{if !isset($guest_order) || (!$guest_order && $addresses)}
+	var addresses = new Array();
+
+	{foreach from=$addresses key=num item=address}
+	addresses[{$num}] = {literal} { {/literal}
+		company: '{$address->company}',
+		honorific: '{$address->honorific}',
+		firstname: '{$address->firstname}',
+		surname: '{$address->surname}',
+		street: '{$address->street}',
+		house_number: '{$address->house_number}',
+		zip_code: '{$address->zip_code}',
+		city: '{$address->city}',
+		country: '{$address->country}'
+	{literal} } {/literal};
+	{/foreach}
+{else}
+	var addresses = undefined;
+{/if}
+
+{if isset($guest_order) && $guest_order == 1}
+	{* 18.09.2026 -- Express-Kauf (PayPal liefert keine Anrede): Anrede ist keine Pflicht,
+	   dafuer Vor- und Nachname immer. Sonst unveraendert. *}
+	var expressActive = {if isset($express_active) && $express_active}true{else}false{/if};
+{literal}
+	$('#send_order_button').click(function(e) {
+		e.preventDefault();
+
+		if ($('#guest_order_email').val() == '' || 
+			(!expressActive && $('#billing_honorific').val() == '') || 
+			(expressActive && ( $('#billing_firstname').val() == '' ||  $('#billing_surname').val() == '')) ||
+			(!expressActive && ($('#billing_honorific').val() == '0' || $('#billing_honorific').val() == 1) && ( $('#billing_firstname').val() == '' ||  $('#billing_surname').val() == '')) ||
+			($('#billing_honorific').val() == 2 && $('#billing_company').val() == '') ||
+			$('#billing_zip_code').val() == '' || 
+			$('#billing_city').val() == '' || 
+			$('#billing_street').val() == '' || 
+			$('#billing_phone').val() == '' || 
+			$('#billing_house_number').val() == ''
+		) {
+			alert('Bitte geben Sie eine vollständige Rechnungsadresse an!');
+		}
+		else if ($('#shipping_address_select').val() != -1 && 
+				(
+					(!expressActive && $('#shipping_honorific').val() == '') || 
+					(expressActive && ( $('#shipping_firstname').val() == '' ||  $('#shipping_surname').val() == '')) ||
+					(!expressActive && ($('#shipping_honorific').val() == '0' || $('#shipping_honorific').val() == 1) && ( $('#shipping_firstname').val() == '' ||  $('#shipping_surname').val() == '')) ||
+					($('#shipping_honorific').val() == 2 && $('#shipping_company').val() == '') ||
+					$('#shipping_zip_code').val() == '' || 
+					$('#shipping_city').val() == '' || 
+					$('#shipping_street').val() == '' || 
+					$('#shipping_house_number').val() == ''
+				)
+		) {
+			alert('Bitte geben Sie eine vollständige Lieferadresse an!');
+		}
+                else if(!$('#agreements_accepted').attr('checked') || !($('#klarna_agreements_info').css('display') == 'none' || $('#klarna_agreements_accepted').attr('checked'))){
+			alert("Sie müssen unsere AGB's bestätigen!");
+		}
+		else {		
+			$('#cashdesk_action').val('ready2fly');
+			$('#order_form').submit();
+		}
+
+	});
+
+        
+	$(document).ready(function() {
+
+	$('#bill_country, #shipping_country').change(function(e) {
+		$('#cashdesk_action').val('reload');
+		$('#order_form').submit();
+	});
+
+
+
+});
+{/literal}
+{else}
+{literal}
+	$('#send_order_button').click(function(e) {
+		e.preventDefault();
+		if ($('#billing_address_select').val() == '') {
+			//alert('Bitte geben Sie eine vollständige Rechnungsadresse an!');
+			alert('Sie haben noch nicht Ihre neue Rechnungsadresse abgespeichert. Der Button "Daten speichern" befindet sich oben beim Adressreld! Durch die Änderung erfolgt eine neue Bezahlkostenberechnung.');
+		}
+		else if ($('#shipping_address_select').val() == '') {
+			//alert('Bitte geben Sie eine vollständige Lieferadresse an!');
+			alert('Sie haben noch nicht Ihre neue Lieferadresse abgespeichert. Der Button "Daten speichern" befindet sich oben beim Adressreld! Durch die Änderung erfolgt eine neue Versandkostenberechnung.');
+		}
+                else if($('#customer_order_email').length && $('#customer_order_email').val() == ''){
+			alert("Bitte geben Sie eine E-Mail Adresse ein!");
+		}
+                else if(!$('#agreements_accepted').attr('checked') || !($('#klarna_agreements_info').css('display') == 'none' || $('#klarna_agreements_accepted').attr('checked'))){
+			alert("Sie müssen unsere AGB's bestätigen!");
+		}
+		else {		
+			$('#cashdesk_action').val('ready2fly');
+			$('#order_form').submit();
+		}
+
+	});
+{/literal}
+{/if}
+
+</script>
+
+<script src="{$PARENT_THEME_DIR}/media/js/content_cash_desk.js?version=1" type="text/javascript"></script>
diff --git a/themes/easyshop_advanced/templates/content_cash_desk/address_invoice.tpl b/themes/easyshop_advanced/templates/content_cash_desk/address_invoice.tpl
index 2564ea6..af79cbf 100644
--- a/themes/easyshop_advanced/templates/content_cash_desk/address_invoice.tpl
+++ b/themes/easyshop_advanced/templates/content_cash_desk/address_invoice.tpl
@@ -1,154 +1,154 @@
-<!-- content_cash_desk/address_invoice.tpl -->
-<div class="full_box"> 
-	<div class="title_wrapper">
-		<div class="title"><h2>Rechnungsanschrift</h2></div>
-		<div class="clear"></div>
-	</div>
-	<div class="box_content">
-		<div id="billing_address_container" class="box_padder">
-			{if !isset($guest_order) || $guest_order != 1}
-			<select class="formatted" id="billing_address_select" name="billing[address]" size="1">
-				<option value="">Rechnungsanschrift w&auml;hlen</option>
-				<option value="" style="font-weight:bold;color:#990000;">Neue Adresse anlegen</option>
-				{foreach from=$addresses key=address_id item=address}
-					<option value="{$address_id}" {if (!(isset($personal_data.billing.address) && $personal_data.billing.address) && $customer->default_address == $address_id) || (isset($personal_data.billing.address) && $personal_data.billing.address == $address_id)}selected="selected"{/if}>
-					{*{$address->firstname} {$address->surname}, {if $address->company}{$address->company}, {/if}{$address->city}*}
-					{if $address->honorific == 0}
-						Herr {$address->firstname} {$address->surname}
-					{else if $address->honorific == 1}
-						Frau {$address->firstname} {$address->surname}
-					{else}
-						Firma {$address->company}
-					{/if}
-					,{$address->street} {$address->house_number}, {$address->zip_code} {$address->city},
-					{foreach from=$countries item=country}
-						{if $country->id == $address->country}
-							{$country->name}
-						{/if}
-					{/foreach}
-				</option>
-				{/foreach}
-			</select>
-			<br /><br />
-			{else}
-				<input id="input_billing_address" type="hidden" name="billing[billing_address]" value="{if isset($personal_data.billing.billing_address) && $personal_data.billing.billing_address}{$personal_data.billing.billing_address}{else}{$customer->default_address}{/if}" />
-			{/if}
-			<div class="consists_of_3">
-				<div style="width:213px;float:left;">
-					<label class="obligatory">Anrede <span>*</span></label>
-					{* Express-Kauf: der Anbieter liefert keine Anrede, darum hier keine Pflicht (14.09.2026) *}
-					<select id="billing_honorific" class="formatted {if !isset($express_active) || !$express_active}obligatory{/if}" name="billing[honorific]" title="">
-						<option value="">Bitte w&auml;hlen...</option>
-						<option value="0" {if isset($personal_data.billing.honorific) && $personal_data.billing.honorific == 0 && $personal_data.billing.honorific != ''}selected{/if}>Herr</option>
-						<option value="1" {if isset($personal_data.billing.honorific) && $personal_data.billing.honorific == 1}selected{/if}>Frau</option>
-						<option value="2" {if isset($personal_data.billing.honorific) && $personal_data.billing.honorific == 2}selected{/if}>Firma</option>
-					</select>
-				</div>
-				<div style="width:213px;margin-left:20px;float:left;">
-					<label class="address_person">Vorname <span>*</span></label>
-					<input type="text" id="billing_firstname" class="formatted obligatory" name="billing[firstname]" value="{if isset($personal_data.billing.firstname) && $personal_data.billing.firstname}{$personal_data.billing.firstname}{/if}" title="Vorname" />
-				</div>
-
-				<div style="width:213px;margin-left:20px;float:left;">
-					<label class="address_person">Nachname <span>*</span></label>
-					<input type="text" id="billing_surname" class="formatted obligatory" name="billing[surname]" value="{if isset($personal_data.billing.surname) && $personal_data.billing.surname}{$personal_data.billing.surname}{/if}" title="Nachname" />
-				</div>
-				<br style="clear:left;" />
-			</div>
-			<br />
-
-			<div class="consists_of_1">
-				<div style="width:680px;float:left;">
-					<label class="address_company">Firma <span>*</span></label>
-					<input type="text" id="billing_company" class="formatted" name="billing[company]" value="{if isset($personal_data.billing.company) && $personal_data.billing.company}{$personal_data.billing.company}{/if}" title="Firma" />
-				</div>
-				<br style="clear:left;" />
-			</div>
-			<br />
-
-			<div class="consists_of_2 split_2_1">
-				<div style="width:446px;float:left;">
-					<label class="obligatory">Stra&szlig;e <span>*</span></label>
-					<input type="text" id="billing_street" class="formatted obligatory" name="billing[street]" value="{if isset($personal_data.billing.street) && $personal_data.billing.street}{$personal_data.billing.street}{/if}" title="Straße" />
-				</div>
-
-				<div style="width:213px;margin-left:20px;float:left;">
-					<label class="obligatory">Hausnummer <span>*</span></label>
-					<input type="text" id="billing_house_number" class="formatted obligatory" name="billing[house_number]" value="{if isset($personal_data.billing.house_number) && $personal_data.billing.house_number}{$personal_data.billing.house_number}{/if}" title="Hausnummer" />
-				</div>
-				<br style="clear:left;" />
-			</div>
-			<br />
-
-			<div class="consists_of_3">
-				<div style="width:213px;float:left;">
-					<label class="obligatory">PLZ <span>*</span></label>
-					<input type="text" id="billing_zip_code" class="formatted obligatory" name="billing[zip_code]" value="{if isset($personal_data.billing.zip_code) && $personal_data.billing.zip_code}{$personal_data.billing.zip_code}{/if}" title="PLZ" />
-				</div>
-
-				<div style="width:213px;margin-left:20px;float:left;">
-					<label class="obligatory">Ort <span>*</span></label>
-					<input type="text" id="billing_city" class="formatted obligatory" name="billing[city]" value="{if isset($personal_data.billing.city) && $personal_data.billing.city}{$personal_data.billing.city}{/if}" title="Ort" />
-				</div>
-
-				<div style="width:213px;margin-left:20px;float:left;">
-					<label class="obligatory">Land <span>*</span></label>
-					<select id="bill_country" class="formatted obligatory" name="billing[country]" title="">
-						<option value="">Land</option>
-						{foreach from=$countries item=country}
-							<option value="{$country->id}" {if isset($billing_address['country']) && $billing_address['country'] == $country->id}selected{/if}>{$country->name}</option>
-						{/foreach}
-					</select>
-				</div>
-				<br style="clear:left;" />
-			</div>
-			<br />
-
-			{if isset($guest_order) && $guest_order == 1}
-			<div class="consists_of_3">
-				<div style="width:213px;float:left;">
-					<label class="obligatory">E-Mail <span>*</span></label>
-					<input id="guest_order_email" type="text" class="formatted obligatory" name="billing[email]" value="{if isset($personal_data.billing.email) && $personal_data.billing.email}{$personal_data.billing.email}{/if}" title="email" />
-				</div>
-
-				<div style="width:213px;margin-left:20px;float:left;">
-					<label>Telefon <span>*</span></label>
-					<input type="text" id="guest_order_phone" class="formatted" name="billing[phone]" value="{if isset($personal_data.billing.phone) && $personal_data.billing.phone}{$personal_data.billing.phone}{/if}" title="phone" />
-				</div>
-				<br style="clear:left;" />
-			</div>
-			{/if}
-
-			{if !isset($guest_order) || $guest_order != 1}
-			<div class="consists_of_2 split_2_1">
-				<div id="billing_save_message" style="float:left;font-weight:bold;"></div>
-				<div style="float:right;">
-					<input id="cashdesk_button_save_billing" type="button" class="button" value="&gt;&gt; Daten speichern" />
-				</div>
-
-				<br style="clear:both;" />
-			</div>
-			{/if}
-
-			{if (!isset($guest_order) || $guest_order != 1) && $customer->email == ''}
-				<br><br><br><br><br>
-				<div class="full_box"> 
-					<div class="title_wrapper">
-						<div class="title"><h2>E-Mail Adresse für die Bestellbenachrichtigungen</h2></div>
-						<div class="clear"></div>
-					</div>
-					<div class="box_content">
-						<div class="consists_of_3">
-							<div style="width:500px;float:left;">
-								<input id="customer_order_email" type="text" class="formatted obligatory" name="billing[email]" value="{if isset($personal_data.billing.email) && $personal_data.billing.email}{$personal_data.billing.email}{/if}" title="email" style="width:500px;"  />
-							</div>
-							<br style="clear:left;" />
-						</div>
-					</div>
-				</div>
-                        
-			{/if}
-
-		</div>
-	</div>
-</div>
+<!-- content_cash_desk/address_invoice.tpl -->
+<div class="full_box"> 
+	<div class="title_wrapper">
+		<div class="title"><h2>Rechnungsanschrift</h2></div>
+		<div class="clear"></div>
+	</div>
+	<div class="box_content">
+		<div id="billing_address_container" class="box_padder">
+			{if !isset($guest_order) || $guest_order != 1}
+			<select class="formatted" id="billing_address_select" name="billing[address]" size="1">
+				<option value="">Rechnungsanschrift w&auml;hlen</option>
+				<option value="" style="font-weight:bold;color:#990000;">Neue Adresse anlegen</option>
+				{foreach from=$addresses key=address_id item=address}
+					<option value="{$address_id}" {if (!(isset($personal_data.billing.address) && $personal_data.billing.address) && $customer->default_address == $address_id) || (isset($personal_data.billing.address) && $personal_data.billing.address == $address_id)}selected="selected"{/if}>
+					{*{$address->firstname} {$address->surname}, {if $address->company}{$address->company}, {/if}{$address->city}*}
+					{if $address->honorific == 0}
+						Herr {$address->firstname} {$address->surname}
+					{else if $address->honorific == 1}
+						Frau {$address->firstname} {$address->surname}
+					{else}
+						Firma {$address->company}
+					{/if}
+					,{$address->street} {$address->house_number}, {$address->zip_code} {$address->city},
+					{foreach from=$countries item=country}
+						{if $country->id == $address->country}
+							{$country->name}
+						{/if}
+					{/foreach}
+				</option>
+				{/foreach}
+			</select>
+			<br /><br />
+			{else}
+				<input id="input_billing_address" type="hidden" name="billing[billing_address]" value="{if isset($personal_data.billing.billing_address) && $personal_data.billing.billing_address}{$personal_data.billing.billing_address}{else}{$customer->default_address}{/if}" />
+			{/if}
+			<div class="consists_of_3">
+				<div style="width:213px;float:left;">
+					<label class="{if !isset($express_active) || !$express_active}obligatory{/if}">Anrede{if !isset($express_active) || !$express_active} <span>*</span>{/if}</label>
+					{* Express-Kauf: der Anbieter liefert keine Anrede, darum hier keine Pflicht (14.09.2026) *}
+					<select id="billing_honorific" class="formatted {if !isset($express_active) || !$express_active}obligatory{/if}" name="billing[honorific]" title="">
+						<option value="">Bitte w&auml;hlen...</option>
+						<option value="0" {if isset($personal_data.billing.honorific) && $personal_data.billing.honorific == 0 && $personal_data.billing.honorific != ''}selected{/if}>Herr</option>
+						<option value="1" {if isset($personal_data.billing.honorific) && $personal_data.billing.honorific == 1}selected{/if}>Frau</option>
+						<option value="2" {if isset($personal_data.billing.honorific) && $personal_data.billing.honorific == 2}selected{/if}>Firma</option>
+					</select>
+				</div>
+				<div style="width:213px;margin-left:20px;float:left;">
+					<label class="address_person">Vorname <span>*</span></label>
+					<input type="text" id="billing_firstname" class="formatted obligatory" name="billing[firstname]" value="{if isset($personal_data.billing.firstname) && $personal_data.billing.firstname}{$personal_data.billing.firstname}{/if}" title="Vorname" />
+				</div>
+
+				<div style="width:213px;margin-left:20px;float:left;">
+					<label class="address_person">Nachname <span>*</span></label>
+					<input type="text" id="billing_surname" class="formatted obligatory" name="billing[surname]" value="{if isset($personal_data.billing.surname) && $personal_data.billing.surname}{$personal_data.billing.surname}{/if}" title="Nachname" />
+				</div>
+				<br style="clear:left;" />
+			</div>
+			<br />
+
+			<div class="consists_of_1">
+				<div style="width:680px;float:left;">
+					<label class="address_company">Firma <span>*</span></label>
+					<input type="text" id="billing_company" class="formatted" name="billing[company]" value="{if isset($personal_data.billing.company) && $personal_data.billing.company}{$personal_data.billing.company}{/if}" title="Firma" />
+				</div>
+				<br style="clear:left;" />
+			</div>
+			<br />
+
+			<div class="consists_of_2 split_2_1">
+				<div style="width:446px;float:left;">
+					<label class="obligatory">Stra&szlig;e <span>*</span></label>
+					<input type="text" id="billing_street" class="formatted obligatory" name="billing[street]" value="{if isset($personal_data.billing.street) && $personal_data.billing.street}{$personal_data.billing.street}{/if}" title="Straße" />
+				</div>
+
+				<div style="width:213px;margin-left:20px;float:left;">
+					<label class="obligatory">Hausnummer <span>*</span></label>
+					<input type="text" id="billing_house_number" class="formatted obligatory" name="billing[house_number]" value="{if isset($personal_data.billing.house_number) && $personal_data.billing.house_number}{$personal_data.billing.house_number}{/if}" title="Hausnummer" />
+				</div>
+				<br style="clear:left;" />
+			</div>
+			<br />
+
+			<div class="consists_of_3">
+				<div style="width:213px;float:left;">
+					<label class="obligatory">PLZ <span>*</span></label>
+					<input type="text" id="billing_zip_code" class="formatted obligatory" name="billing[zip_code]" value="{if isset($personal_data.billing.zip_code) && $personal_data.billing.zip_code}{$personal_data.billing.zip_code}{/if}" title="PLZ" />
+				</div>
+
+				<div style="width:213px;margin-left:20px;float:left;">
+					<label class="obligatory">Ort <span>*</span></label>
+					<input type="text" id="billing_city" class="formatted obligatory" name="billing[city]" value="{if isset($personal_data.billing.city) && $personal_data.billing.city}{$personal_data.billing.city}{/if}" title="Ort" />
+				</div>
+
+				<div style="width:213px;margin-left:20px;float:left;">
+					<label class="obligatory">Land <span>*</span></label>
+					<select id="bill_country" class="formatted obligatory" name="billing[country]" title="">
+						<option value="">Land</option>
+						{foreach from=$countries item=country}
+							<option value="{$country->id}" {if isset($billing_address['country']) && $billing_address['country'] == $country->id}selected{/if}>{$country->name}</option>
+						{/foreach}
+					</select>
+				</div>
+				<br style="clear:left;" />
+			</div>
+			<br />
+
+			{if isset($guest_order) && $guest_order == 1}
+			<div class="consists_of_3">
+				<div style="width:213px;float:left;">
+					<label class="obligatory">E-Mail <span>*</span></label>
+					<input id="guest_order_email" type="text" class="formatted obligatory" name="billing[email]" value="{if isset($personal_data.billing.email) && $personal_data.billing.email}{$personal_data.billing.email}{/if}" title="email" />
+				</div>
+
+				<div style="width:213px;margin-left:20px;float:left;">
+					<label>Telefon <span>*</span></label>
+					<input type="text" id="guest_order_phone" class="formatted" name="billing[phone]" value="{if isset($personal_data.billing.phone) && $personal_data.billing.phone}{$personal_data.billing.phone}{/if}" title="phone" />
+				</div>
+				<br style="clear:left;" />
+			</div>
+			{/if}
+
+			{if !isset($guest_order) || $guest_order != 1}
+			<div class="consists_of_2 split_2_1">
+				<div id="billing_save_message" style="float:left;font-weight:bold;"></div>
+				<div style="float:right;">
+					<input id="cashdesk_button_save_billing" type="button" class="button" value="&gt;&gt; Daten speichern" />
+				</div>
+
+				<br style="clear:both;" />
+			</div>
+			{/if}
+
+			{if (!isset($guest_order) || $guest_order != 1) && $customer->email == ''}
+				<br><br><br><br><br>
+				<div class="full_box"> 
+					<div class="title_wrapper">
+						<div class="title"><h2>E-Mail Adresse für die Bestellbenachrichtigungen</h2></div>
+						<div class="clear"></div>
+					</div>
+					<div class="box_content">
+						<div class="consists_of_3">
+							<div style="width:500px;float:left;">
+								<input id="customer_order_email" type="text" class="formatted obligatory" name="billing[email]" value="{if isset($personal_data.billing.email) && $personal_data.billing.email}{$personal_data.billing.email}{/if}" title="email" style="width:500px;"  />
+							</div>
+							<br style="clear:left;" />
+						</div>
+					</div>
+				</div>
+                        
+			{/if}
+
+		</div>
+	</div>
+</div>
diff --git a/themes/easyshop_advanced/templates/content_cash_desk/address_shipping.tpl b/themes/easyshop_advanced/templates/content_cash_desk/address_shipping.tpl
index 05f7c0f..e7cadd8 100644
--- a/themes/easyshop_advanced/templates/content_cash_desk/address_shipping.tpl
+++ b/themes/easyshop_advanced/templates/content_cash_desk/address_shipping.tpl
@@ -39,7 +39,7 @@
 			<div class="shipping_address_form_container" style="display:none;">
 				<div class="consists_of_3">
 					<div style="width:213px;float:left;">
-                                                <label class="obligatory">Anrede <span>*</span></label>
+                                                <label class="{if !isset($express_active) || !$express_active}obligatory{/if}">Anrede{if !isset($express_active) || !$express_active} <span>*</span>{/if}</label>
 						<select id="shipping_honorific" class="formatted {if !isset($express_active) || !$express_active}obligatory{/if}" name="shipping[honorific]" title="">
 							<option value=""{if $personal_data.shipping.honorific == ''} selected{/if}>Bitte w&auml;hlen...</option>
 							<option value="0"{if $personal_data.shipping.honorific == 0} selected{/if}>Herr</option>