diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index f02073e2b..05fb55011 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -230,7 +230,10 @@ class Kontakt extends FHCAPI_Controller
 			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'PLZ'])
 		]);
 
-		if(isset($_POST['gemeinde']) && isset($_POST['ort']) && isset($_POST['nation']) && ($_POST['nation'] == 'A'))
+		if(isset($_POST['gemeinde']) && ($_POST['gemeinde'] != '')
+			&& isset($_POST['ort']) && ($_POST['ort'] != '')
+			&& isset($_POST['nation']) && ($_POST['nation'] == 'A')
+			&& isset($_POST['plz']) && ($_POST['plz'] != '')  )
 		{
 			$this->form_validation->set_rules('address.plz', 'Postleitzahl', 'callback_validateLocationCombination', [
 				'validateLocationCombination' => $this->p->t('ui', 'error_location_combination')
@@ -278,7 +281,7 @@ class Kontakt extends FHCAPI_Controller
 				'strasse' =>  $strasse,
 				'updatevon' => $uid,
 				'updateamum' => date('c'),
-				'plz' => $_POST['address']['plz'],
+				'plz' => $_POST['plz'],
 				'ort' => $ort,
 				'gemeinde' => $gemeinde,
 				'nation' => $nation,
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 5e4632c84..97e676339 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -126,6 +126,7 @@ export default {
 
 							let button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';
+							button.title = this.$p.t('ui', 'notiz_edit');
 							button.innerHTML = '<i class="fa fa-edit"></i>';
 							button.addEventListener(
 								'click',
@@ -136,6 +137,7 @@ export default {
 
 							button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';
+							button.title = this.$p.t('notiz', 'notiz_delete');
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
 							button.addEventListener(
 								'click',
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 7a24c03ff..05041970a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -169,9 +169,9 @@ export default{
 						cm.getColumnByField('person_id').component.updateDefinition({
 							title: this.$p.t('person', 'person_id')
 						});
-						cm.getColumnByField('actions').component.updateDefinition({
+/*						cm.getColumnByField('actions').component.updateDefinition({
 							title: this.$p.t('global', 'aktionen')
-						});
+						});*/
 					}
 				}
 			],
@@ -269,7 +269,6 @@ export default{
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		updateAddress(adresse_id) {
-		//TODO(Manu) buggy with relad, warning/error: e.element.after is not a function
 			this.addressData.plz = this.addressData.address.plz;
 			return this.$refs.addressData.factory.stv.kontakt.updateAddress(adresse_id,
 				this.addressData
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index 140104038..41c6cb58e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -128,9 +128,9 @@ export default{
 						cm.getColumnByField('bankverbindung_id').component.updateDefinition({
 							title: this.$p.t('ui', 'bankverbindung_id')
 						});
-						cm.getColumnByField('actions').component.updateDefinition({
+/*						cm.getColumnByField('actions').component.updateDefinition({
 							title: this.$p.t('global', 'aktionen')
-						});
+						});*/
 					}
 				}
 			],
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index e4af65b30..411a1077f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -124,9 +124,9 @@ export default{
 						cm.getColumnByField('standort_id').component.updateDefinition({
 							title: this.$p.t('ui', 'standort_id')
 						});
-						cm.getColumnByField('actions').component.updateDefinition({
+/*						cm.getColumnByField('actions').component.updateDefinition({
 							title: this.$p.t('global', 'aktionen')
-						});
+						});*/
 				}}
 			],
 			lastSelected: null,
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 685cdedc7..e6e56fc33 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -23371,6 +23371,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'notiz',
+		'phrase' => 'notiz_delete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Notiz löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete Note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'notiz',