diff --git a/interface/web/dns/dns_spf_edit.php b/interface/web/dns/dns_spf_edit.php
index 94096662a1e8e0af7e0e228d322d0c955076b8f2..70f39e44eb2b135abdea6a0251db227388c22c93 100644
--- a/interface/web/dns/dns_spf_edit.php
+++ b/interface/web/dns/dns_spf_edit.php
@@ -72,13 +72,16 @@ class page_action extends tform_actions {
 	}
 
 	function onShowEnd() {
-		global $app, $conf;
+		global $app;
+
+		$id = $app->functions->intval($_GET['id']);
 
-		$zone = $app->functions->intval($_GET['zone']);
+		// if there is no existing SPF record, assume we want a new active record
+		$app->tpl->setVar('active', 'CHECKED');
 
 		//* check for an existing spf-record
-		$sql = "SELECT data, active FROM dns_rr WHERE data LIKE 'v=spf1%' AND zone = ? AND " . $app->tform->getAuthSQL('r');
-		$rec = $app->db->queryOneRecord($sql, $zone);
+		$sql = "SELECT data, active FROM dns_rr WHERE id = ? AND " . $app->tform->getAuthSQL('r');
+		$rec = $app->db->queryOneRecord($sql, $id);
 		if ( isset($rec) && !empty($rec) ) {
 			$this->id = 1;
 			$old_data = strtolower($rec['data']);
@@ -132,7 +135,6 @@ class page_action extends tform_actions {
 	function onSubmit() {
 		global $app, $conf;
 
-
 		// Get the parent soa record of the domain
 		$soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? AND " . $app->tform->getAuthSQL('r'), $app->functions->intval($_POST["zone"]));
 
@@ -153,8 +155,27 @@ class page_action extends tform_actions {
 				}
 			}
 		} // end if user is not admin
+		
+		// Check that the record does not yet exist
+		$existing_records = $app->db->queryAllRecords("SELECT id FROM dns_rr WHERE id != ? AND zone = ? AND name = ? AND type = 'TXT'", $this->dataRecord['id'], $_POST['zone'], $_POST['name']);
+		if (!empty($existing_records)) {
+			if (count($existing_records) > 1) {
+				$multiple_existing_records_error_txt = $app->tform->wordbook['spf_record_exists_multiple_txt'];
+				$multiple_existing_records_error_txt = str_replace('{hostname}', $_POST['name'], $multiple_existing_records_error_txt);
+
+				$app->error($multiple_existing_records_error_txt);
+			}
 
-		//create spf-record
+			$existing_record = array_pop($existing_records);
+			
+			$existing_record_error_txt = $app->tform->wordbook['spf_record_exists_txt'];
+			$existing_record_error_txt = str_replace('{hostname}', $_POST['name'], $existing_record_error_txt);
+			$existing_record_error_txt = str_replace('{existing_record_id}', $existing_record['id'], $existing_record_error_txt);
+
+			$app->error($existing_record_error_txt);
+		}
+
+		// Create spf-record
 		if (!empty($this->dataRecord['spf_mx'])) {
 			$spf_record[] = 'mx';
 		}
@@ -217,7 +238,6 @@ class page_action extends tform_actions {
 		else $this->dataRecord['data'] = 'v=spf1 ' . $this->dataRecord['spf_mechanism'] . 'all';
 		unset($temp);
 
-		$this->dataRecord['name'] = $soa['origin'];
 		if (isset($this->dataRecord['active'])) $this->dataRecord['active'] = 'Y';
 		
 		// Set the server ID of the rr record to the same server ID as the parent record.
@@ -228,10 +248,6 @@ class page_action extends tform_actions {
 		$this->dataRecord["serial"] = $app->validate_dns->increase_serial($soa["serial"]);
 		$this->dataRecord["stamp"] = date('Y-m-d H:i:s');
 
-		// always update an existing entry
-		$check=$app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = ? AND type = ? AND data LIKE 'v=spf1%' AND name = ?", $this->dataRecord["zone"], $this->dataRecord["type"], $this->dataRecord['name']);
-		$this->id = $check['id'];
-
 		if (!isset($this->dataRecord['active'])) $this->dataRecord['active'] = 'N';
 
 		parent::onSubmit();
diff --git a/interface/web/dns/dns_txt_edit.php b/interface/web/dns/dns_txt_edit.php
index 8f61d2bfe725e218df4a2c3d28b06f040e6ca570..6d518e19d5300b0bbad8d363c9e7ed486efe4cff 100644
--- a/interface/web/dns/dns_txt_edit.php
+++ b/interface/web/dns/dns_txt_edit.php
@@ -44,7 +44,22 @@ require_once './dns_edit_base.php';
 
 // Loading classes
 class page_action extends dns_page_action {
+	function onLoad() {
+		parent::onLoad();
+		
+		// The SPF wizard has a button to edit a record as TXT. We need this to prevent a redirect loop.
+		if (!empty($_GET['edit_raw'])) {
+			return;
+		}
 
+		// Redirect to SPF wizard if we detect a SPF record
+		if (!empty($this->dataRecord['data'])) {
+			if ('v=spf1' === mb_substr($this->dataRecord['data'], 0, 6)) {
+				header(sprintf('Location: dns_spf_edit.php?id=%d', $this->dataRecord['id']));
+				exit;
+			}
+		}
+	}
 }
 
 $page = new page_action;
diff --git a/interface/web/dns/form/dns_spf.tform.php b/interface/web/dns/form/dns_spf.tform.php
index 62b6b5283b58dc03f582be5e2f730ee31041e90d..53081b7ccabdf11b10d674abcb3cde1afe5260e4 100644
--- a/interface/web/dns/form/dns_spf.tform.php
+++ b/interface/web/dns/form/dns_spf.tform.php
@@ -86,7 +86,7 @@ $form["tabs"]['dns'] = array (
 					'type' => 'TOLOWER')
 			),
 			'validators' => array (  0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-9\.\-\_]{0,255}$/',
+					'regex' => '/^(\*\.|[a-zA-Z0-9\.\-\_]){0,255}$/',
 					'errmsg'=> 'name_error_regex'),
 			),
 			'default' => '',
diff --git a/interface/web/dns/lib/lang/ar_dns_spf.lng b/interface/web/dns/lib/lang/ar_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/ar_dns_spf.lng
+++ b/interface/web/dns/lib/lang/ar_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/bg_dns_spf.lng b/interface/web/dns/lib/lang/bg_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/bg_dns_spf.lng
+++ b/interface/web/dns/lib/lang/bg_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/br_dns_spf.lng b/interface/web/dns/lib/lang/br_dns_spf.lng
index 739e59cf41787cc4d0dec825d9fe8afb79540cf4..bbf571c3b78143a1c03668e1fd658c0d403af95d 100644
--- a/interface/web/dns/lib/lang/br_dns_spf.lng
+++ b/interface/web/dns/lib/lang/br_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'Registro SPF';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'Mecanismo SPF';
 $wb['spf_mechanism_pass_txt'] = 'Pass - permitir e-mails de outros remetentes';
 $wb['spf_mechanism_fail_txt'] = 'Fail - rejeitar e-mails de outros remetentes';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'O domínio é inválido.';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Ativo';
 $wb['record_exists_txt'] = 'Registro dns já existe.';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'O limite de registros dns para esta conta foi alcançado.';
 $wb['no_zone_perm'] = 'Você não tem permissão para adicionar registros dns nesta zona.';
 $wb['ttl_range_error'] = 'O TTL mínimo são 60 segundos.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/ca_dns_spf.lng b/interface/web/dns/lib/lang/ca_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/ca_dns_spf.lng
+++ b/interface/web/dns/lib/lang/ca_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/cz_dns_spf.lng b/interface/web/dns/lib/lang/cz_dns_spf.lng
index 3086454c34e87cff4a5c722ab48b0c7963632c14..a5691ee3409f32e7f9e0f8f09915583c8585a867 100644
--- a/interface/web/dns/lib/lang/cz_dns_spf.lng
+++ b/interface/web/dns/lib/lang/cz_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF Záznam';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanismus';
 $wb['spf_mechanism_pass_txt'] = 'Přijmout - přijímat e-mail od ostatních odesílatelů';
 $wb['spf_mechanism_fail_txt'] = 'Odmítat - odmítnout e-mail od ostatních odesílatelů';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Neplatné doménové jméno';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Aktivní';
 $wb['record_exists_txt'] = 'DNS záznam již existuje';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'Byl dosažen max. počet DNS záznamů pro váš účet.';
 $wb['no_zone_perm'] = 'Nemáte oprávnění přidat záznam do této zóny DNS.';
 $wb['ttl_range_error'] = 'Min. TTL doba je 60 sekund.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_spf.lng b/interface/web/dns/lib/lang/de_dns_spf.lng
index aec5595ad323afbb2212c79a529fb3cac4544828..a4f0f7827f4056c2d614837f303dd6fc1427fb14 100644
--- a/interface/web/dns/lib/lang/de_dns_spf.lng
+++ b/interface/web/dns/lib/lang/de_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanismus';
 $wb['spf_mechanism_pass_txt'] = 'Pass - Mails von anderen Sendern zulassen';
 $wb['spf_mechanism_fail_txt'] = 'Fail - Mails von anderen Sendern abweisen';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Ungültiger Domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Aktiv';
 $wb['record_exists_txt'] = 'DNS-Eintrag existiert bereits';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['ttl_range_error'] = 'Min. TTL time ist 60 Sekunden.';
 $wb['limit_dns_record_txt'] = 'Die maximale Anzahl an DNS Einträgen für Ihr Konto wurde erreicht.';
 $wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/dk_dns_spf.lng b/interface/web/dns/lib/lang/dk_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/dk_dns_spf.lng
+++ b/interface/web/dns/lib/lang/dk_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_spf.lng b/interface/web/dns/lib/lang/el_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/el_dns_spf.lng
+++ b/interface/web/dns/lib/lang/el_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/en_dns_spf.lng b/interface/web/dns/lib/lang/en_dns_spf.lng
index 7ac24dd227b26b9a34faa0b6877a8a7c5a53b99a..455b5ce0abedd7915331e4ac88271d5a2c6d9d91 100644
--- a/interface/web/dns/lib/lang/en_dns_spf.lng
+++ b/interface/web/dns/lib/lang/en_dns_spf.lng
@@ -2,6 +2,7 @@
 
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -21,8 +22,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb["ttl_txt"] = 'TTL';
 $wb["active_txt"] = 'Active';
 $wb["record_exists_txt"] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb["limit_dns_record_txt"] = 'The max. number of DNS records for your account is reached.';
 $wb["no_zone_perm"] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
-
diff --git a/interface/web/dns/lib/lang/es_dns_spf.lng b/interface/web/dns/lib/lang/es_dns_spf.lng
index e4094672bb524276712d89d6dfd2820b97be6bb7..353134adededa67f3dc5ed8ff65e0725c409bde7 100755
--- a/interface/web/dns/lib/lang/es_dns_spf.lng
+++ b/interface/web/dns/lib/lang/es_dns_spf.lng
@@ -1,9 +1,12 @@
 <?php
 $wb['active_txt'] = 'Habilitado';
+$wb['name_txt'] = 'Hostname';
 $wb['data_txt'] = 'Registro SPF';
 $wb['limit_dns_record_txt'] = 'Ha alcanzado el número máx. de registros DNS permitidos para su cuenta.';
 $wb['no_zone_perm'] = 'Usted no tiene permisos para agregar un registro a esta zona DNS.';
 $wb['record_exists_txt'] = 'El registro DNS ya existe';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['spf_a_txt'] = 'Permitir a la dirección IP actual del dominio enviar correo electrónico para este dominio';
 $wb['spf_domain_note_txt'] = '(dominios separados por espacios en blanco)';
 $wb['spf_domain_txt'] = 'Cualquier dominio que pueda entregar o retransmitir correo para este dominio';
@@ -22,4 +25,5 @@ $wb['spf_mechanism_txt'] = 'Mecanismo SPF';
 $wb['spf_mx_txt'] = 'Permite a los servidores configurados como MX enviar correos desde este dominio';
 $wb['ttl_range_error'] = 'El tiempo mín. de TTL es 60 segundos.';
 $wb['ttl_txt'] = 'TTL';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/fi_dns_spf.lng b/interface/web/dns/lib/lang/fi_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/fi_dns_spf.lng
+++ b/interface/web/dns/lib/lang/fi_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_spf.lng b/interface/web/dns/lib/lang/fr_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/fr_dns_spf.lng
+++ b/interface/web/dns/lib/lang/fr_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/hr_dns_spf.lng b/interface/web/dns/lib/lang/hr_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/hr_dns_spf.lng
+++ b/interface/web/dns/lib/lang/hr_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/hu_dns_spf.lng b/interface/web/dns/lib/lang/hu_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/hu_dns_spf.lng
+++ b/interface/web/dns/lib/lang/hu_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/id_dns_spf.lng b/interface/web/dns/lib/lang/id_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/id_dns_spf.lng
+++ b/interface/web/dns/lib/lang/id_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_spf.lng b/interface/web/dns/lib/lang/it_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/it_dns_spf.lng
+++ b/interface/web/dns/lib/lang/it_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/ja_dns_spf.lng b/interface/web/dns/lib/lang/ja_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/ja_dns_spf.lng
+++ b/interface/web/dns/lib/lang/ja_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/nl_dns_spf.lng b/interface/web/dns/lib/lang/nl_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/nl_dns_spf.lng
+++ b/interface/web/dns/lib/lang/nl_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/pl_dns_spf.lng b/interface/web/dns/lib/lang/pl_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/pl_dns_spf.lng
+++ b/interface/web/dns/lib/lang/pl_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/pt_dns_spf.lng b/interface/web/dns/lib/lang/pt_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/pt_dns_spf.lng
+++ b/interface/web/dns/lib/lang/pt_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/ro_dns_spf.lng b/interface/web/dns/lib/lang/ro_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/ro_dns_spf.lng
+++ b/interface/web/dns/lib/lang/ro_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/ru_dns_spf.lng b/interface/web/dns/lib/lang/ru_dns_spf.lng
index cc4b4b087be6b840f2d58593d5ff3de096b69cd7..a0e77b41b179675ebbbe0d8f0b68aae2a704b055 100644
--- a/interface/web/dns/lib/lang/ru_dns_spf.lng
+++ b/interface/web/dns/lib/lang/ru_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-запись';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'Механизм SPF';
 $wb['spf_mechanism_pass_txt'] = 'Pass - разрешить почту от других отправителей';
 $wb['spf_mechanism_fail_txt'] = 'Fail - отклонить почту от других отправителей';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Недопустимое доменное им
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Активно';
 $wb['record_exists_txt'] = 'DNS-запись уже существует';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'Макс. количество DNS-записей для вашей учетной записи достигнуто.';
 $wb['no_zone_perm'] = 'У Вас нет прав добавлять эту запись.';
 $wb['ttl_range_error'] = 'Мин. время <b>TTL</b> 60 секунд.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/se_dns_spf.lng b/interface/web/dns/lib/lang/se_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/se_dns_spf.lng
+++ b/interface/web/dns/lib/lang/se_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/sk_dns_spf.lng b/interface/web/dns/lib/lang/sk_dns_spf.lng
index df8d1fe1453faa2d4decfe0d3dc94cf19ff48458..09720321b260004d0b2a32e8b35aef47ae6e9944 100644
--- a/interface/web/dns/lib/lang/sk_dns_spf.lng
+++ b/interface/web/dns/lib/lang/sk_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF-Record';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Mechanism';
 $wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
 $wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
 $wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/lib/lang/tr_dns_spf.lng b/interface/web/dns/lib/lang/tr_dns_spf.lng
index 40cad402a461aff5e9fe8ce0d5c94e6f4257e727..2683560275e395bb03f28dcefe93ef055e606179 100644
--- a/interface/web/dns/lib/lang/tr_dns_spf.lng
+++ b/interface/web/dns/lib/lang/tr_dns_spf.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['data_txt'] = 'SPF Kaydı';
+$wb['name_txt'] = 'Hostname';
 $wb['spf_mechanism_txt'] = 'SPF Yöntemi';
 $wb['spf_mechanism_pass_txt'] = 'Kabul - Diğer göndericilerden gelen e-postalar kabul edilsin';
 $wb['spf_mechanism_fail_txt'] = 'Red - Diğer göndericilerden gelen e-postalar reddedilsin';
@@ -19,7 +20,10 @@ $wb['spf_invalid_domain_txt'] = 'Etki alanı adı geçersiz';
 $wb['ttl_txt'] = 'TTL Süresi';
 $wb['active_txt'] = 'Etkin';
 $wb['record_exists_txt'] = 'DNS kaydı zaten var';
+$wb['spf_record_exists_txt'] = 'SPF-Record already exists for hostname "{hostname}". Do you want to <a href="#" data-load-content="dns/dns_spf_edit.php?id={existing_record_id}">edit the existing record</a>?';
+$wb['spf_record_exists_multiple_txt'] = 'Multiple SPF-Records exist for hostname "{hostname}". This will cause recipients to reject your mail! Delete or merge duplicate existing records and try again.';
 $wb['limit_dns_record_txt'] = 'Hesabınıza ekleyebileceğiniz en fazla DNS kaydı sınırına ulaştınız.';
 $wb['no_zone_perm'] = 'Bu DNS bölgesine kayıt ekleme izniniz yok.';
 $wb['ttl_range_error'] = 'En düşük TTL süresi 60 saniyedir.';
+$wb['btn_edit_as_txt_record_txt'] = 'Edit as TXT record';
 ?>
diff --git a/interface/web/dns/templates/dns_spf_edit.htm b/interface/web/dns/templates/dns_spf_edit.htm
index 3c34b37a41b03d0f74b5f335d2a3986c25f2ed43..fc7400d6200f61c7d24d576da966458d65f5a02d 100644
--- a/interface/web/dns/templates/dns_spf_edit.htm
+++ b/interface/web/dns/templates/dns_spf_edit.htm
@@ -5,6 +5,10 @@
 
 
         
+            <div class="form-group">
+                <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" /></div>
+            </div>
             <div class="form-group">
                 <label for="data" class="col-sm-3 control-label">{tmpl_var name='data_txt'}</label>
 				<div class="col-sm-9"><input type="text" name="data" id="data" value="{tmpl_var name='data'}" readonly class="form-control" /></div></div>
@@ -52,11 +56,11 @@
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
         <input type="hidden" name="zone" value="{tmpl_var name='zone'}" id="zone">
         <input type="hidden" name="type" value="{tmpl_var name='type'}">
-        <input type="hidden" name="name" value="{tmpl_var name='name'}">
             </div>
             
         <div class="clear"><div class="right">
             <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_spf_edit.php">{tmpl_var name='btn_save_txt'}</button>
+            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_edit_as_txt_record_txt'}" data-load-content="dns/dns_txt_edit.php?id={tmpl_var name='id'}&zone={tmpl_var name='zone'}&edit_raw=1">{tmpl_var name='btn_edit_as_txt_record_txt'}</button>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}">{tmpl_var name='btn_cancel_txt'}</button>
         </div></div>