diff --git a/customer_email.php b/customer_email.php
index 9ac4a80f..adad8232 100644
--- a/customer_email.php
+++ b/customer_email.php
@@ -130,10 +130,7 @@ if ($page == 'overview' || $page == 'emails') {
 				));
 				$domains = [];
 				while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-					$domains[] = [
-						'label' => $idna_convert->decode($row['domain']),
-						'value' => $row['domain']
-					];
+					$domains[$row['domain']] = $idna_convert->decode($row['domain']);
 				}
 
 				if (count($domains) > 0) {
diff --git a/lib/formfields/customer/email/formfield.emails_edit.php b/lib/formfields/customer/email/formfield.emails_edit.php
index 592bf5b5..da46a3a7 100644
--- a/lib/formfields/customer/email/formfield.emails_edit.php
+++ b/lib/formfields/customer/email/formfield.emails_edit.php
@@ -35,9 +35,15 @@ return array(
 						'type' => 'label',
 						'value' => $lng['panel']['yes'],
 						'next_to' => [
+							'edit_link' => [
+								'type' => 'link',
+								'href' => $filename . '?page=accounts&action=changepw&id=' . $result['id'],
+								'label' => $lng['menue']['main']['changepassword'],
+								'classes' => 'btn btn-sm btn-secondary'
+							],
 							'del_link' => [
 								'type' => 'link',
-								'href' => $filename . '?page=accounts&action=changepw&id=' . $result['id'] . '&s=' . $s,
+								'href' => $filename . '?page=accounts&action=delete&id=' . $result['id'],
 								'label' => $lng['emails']['account_delete'],
 								'classes' => 'btn btn-sm btn-danger'
 							]
@@ -51,7 +57,7 @@ return array(
 						'next_to' => [
 							'add_link' => [
 								'type' => 'link',
-								'href' => $filename . '?page=accounts&action=add&id=' . $result['id'] . '&s=' . $s,
+								'href' => $filename . '?page=accounts&action=add&id=' . $result['id'],
 								'label' => $lng['emails']['account_add'],
 								'classes' => 'btn btn-sm btn-primary'
 							]
@@ -66,7 +72,7 @@ return array(
 							'add_link' => [
 								'visible' => ((int)$result['popaccountid'] != 0 && \Froxlor\Settings::Get('system.mail_quota_enabled')),
 								'type' => 'link',
-								'href' => $filename . '?page=accounts&action=changequota&id=' . $result['id'] . '&s=' . $s,
+								'href' => $filename . '?page=accounts&action=changequota&id=' . $result['id'],
 								'label' => $lng['emails']['quota_edit'],
 								'classes' => 'btn btn-sm btn-secondary'
 							]
@@ -79,7 +85,7 @@ return array(
 						'next_to' => [
 							'add_link' => [
 								'type' => 'link',
-								'href' => $filename . '?page=' . $page . '&action=togglecatchall&id=' . $result['id'] . '&s=' . $s,
+								'href' => $filename . '?page=' . $page . '&action=togglecatchall&id=' . $result['id'],
 								'label' => '<i class="fa-solid fa-arrow-right-arrow-left"></i> ' . $lng['panel']['toggle'],
 								'classes' => 'btn btn-sm btn-secondary'
 							]
@@ -92,7 +98,7 @@ return array(
 						'next_to' => [
 							'add_link' => [
 								'type' => 'link',
-								'href' => $filename . '?page=forwarders&amp;action=add&amp;id=' . $result['id'] . '&amp;s=' . $s,
+								'href' => $filename . '?page=forwarders&amp;action=add&amp;id=' . $result['id'],
 								'label' => $lng['emails']['forwarder_add'],
 								'classes' => 'btn btn-sm btn-primary'
 							]