diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index 05fb55011..0c2a0af5c 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -230,10 +230,7 @@ class Kontakt extends FHCAPI_Controller
 			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'PLZ'])
 		]);
 
-		if(isset($_POST['gemeinde']) && ($_POST['gemeinde'] != '')
-			&& isset($_POST['ort']) && ($_POST['ort'] != '')
-			&& isset($_POST['nation']) && ($_POST['nation'] == 'A')
-			&& isset($_POST['plz']) && ($_POST['plz'] != '')  )
+		if(isset($_POST['gemeinde']) && isset($_POST['ort']) && isset($_POST['nation']) && $_POST['nation'] == 'A')
 		{
 			$this->form_validation->set_rules('address.plz', 'Postleitzahl', 'callback_validateLocationCombination', [
 				'validateLocationCombination' => $this->p->t('ui', 'error_location_combination')
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 4f9b5be69..483bc29e2 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -440,6 +440,7 @@ export default{
 						<form-input
 							v-else
 							type="text"
+							:label="$p.t('person/gemeinde')"
 							name="addressData.gemeinde"
 							:label="$p.t('person/gemeinde')"
 							v-model="addressData.gemeinde"
@@ -467,6 +468,7 @@ export default{
 					<form-input
 							v-else
 							type="text"
+							:label="$p.t('person/ort')"
 							name="ort"
 							:label="$p.t('person/ort')"
 							v-model="addressData.ort"