diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
index f5697b4f1c27fea3680d93dc3758675eb850e972..8db7baf5eb09fbd7791049e21068a1b7544771fd 100644
--- a/interface/web/mail/mail_domain_edit.php
+++ b/interface/web/mail/mail_domain_edit.php
@@ -331,6 +331,11 @@ class page_action extends tform_actions {
 			$this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]);
 		}
 
+		// Extract the dkim public key if not submitted.
+		if (!empty($this->dataRecord['dkim_private']) && empty( $this->dataRecord['dkim_public']) ) {
+			$this->dataRecord['dkim_public'] = openssl_pkey_get_details(openssl_pkey_get_private($this->dataRecord['dkim_private']))['key'];
+		}
+
 		//* server_id must be > 0
 		if(isset($this->dataRecord["server_id"]) && $this->dataRecord["server_id"] < 1) $app->tform->errorMessage .= $app->lng("server_id_0_error_txt");