diff --git a/client_certificate_edit_modal.php b/client_certificate_edit_modal.php
index f3bc8638..13e55c14 100644
--- a/client_certificate_edit_modal.php
+++ b/client_certificate_edit_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-lock mr-2"></i>Editing certificate: <span class="text-bold" id="editHeader"></span></h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-lock mr-2"></i>Editing certificate: <span class="text-bold" id="editCertificateHeader"></span></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
@@ -28,7 +28,7 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-globe"></i>&nbsp;https://</span>
                             </div>
-                            <input type="text" class="form-control" id="editDomain" name="domain" placeholder="Domain" value="" required>
+                            <input type="text" class="form-control" id="editCertificateDomain" name="domain" placeholder="Domain" value="" required>
                             <div class="input-group-append">
                                 <button type="button" class="btn btn-secondary" onclick="fetchSSL('edit')"><i class="fas fa-fw fa-sync-alt"></i></button>
                             </div>
@@ -41,7 +41,7 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
                             </div>
-                            <input type="text" class="form-control" id="editIssuedBy" name="issued_by" placeholder="Issued By" value="">
+                            <input type="text" class="form-control" id="editCertificateIssuedBy" name="issued_by" placeholder="Issued By" value="">
                         </div>
                     </div>
 
@@ -51,7 +51,7 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
                             </div>
-                            <input type="date" class="form-control" id="editExpire" name="expire" max="2999-12-31" value="">
+                            <input type="date" class="form-control" id="editCertificateExpire" name="expire" max="2999-12-31" value="">
                         </div>
                     </div>
 
@@ -61,13 +61,13 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
                             </div>
-                            <textarea class="form-control" id="editPublicKey" name="public_key"></textarea>
+                            <textarea class="form-control" id="editCertificatePublicKey" name="public_key"></textarea>
                         </div>
                     </div>
 
                     <div class="form-group">
                         <label>Notes</label>
-                        <textarea class="form-control" rows="3" placeholder="Enter some notes" name="notes" id="editNotes"></textarea>
+                        <textarea class="form-control" id="editCertificateNotes" name="notes" rows="3" placeholder="Enter some notes"></textarea>
                     </div>
 
                     <div class="form-group">
diff --git a/client_domain_edit_modal.php b/client_domain_edit_modal.php
index 6d0e665d..07e90b79 100644
--- a/client_domain_edit_modal.php
+++ b/client_domain_edit_modal.php
@@ -33,7 +33,7 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
                                     </div>
-                                    <input type="text" class="form-control" name="name" id="editDomainName" placeholder="Domain name example.com" value="" required>
+                                    <input type="text" class="form-control" id="editDomainName" name="name" placeholder="Domain name example.com" value="" required>
                                 </div>
                             </div>
 
@@ -43,7 +43,7 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
                                     </div>
-                                    <select class="form-control select2" name="registrar" id="editDomainRegistrarId">
+                                    <select class="form-control select2" id="editDomainRegistrarId" name="registrar">
                                     </select>
                                 </div>
                             </div>
@@ -54,7 +54,7 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
                                     </div>
-                                    <select class="form-control select2" name="webhost" id="editDomainWebhostId">
+                                    <select class="form-control select2" id="editDomainWebhostId" name="webhost">
                                     </select>
                                 </div>
                             </div>
@@ -65,13 +65,13 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
                                     </div>
-                                    <input type="date" class="form-control" name="expire" id="editDomainExpire" max="2999-12-31">
+                                    <input type="date" class="form-control" id="editDomainExpire" name="expire" max="2999-12-31">
                                 </div>
                             </div>
 
                             <div class="form-group">
                                 <label>Notes</label>
-                                <textarea class="form-control" rows="3" placeholder="Enter some notes" name="notes" id="editDomainNotes"></textarea>
+                                <textarea class="form-control" id="editDomainNotes" name="notes" rows="3" placeholder="Enter some notes"></textarea>
                             </div>
 
                         </div>
diff --git a/js/certificate_edit_modal.js b/js/certificate_edit_modal.js
index 2beb1bee..6ac93561 100644
--- a/js/certificate_edit_modal.js
+++ b/js/certificate_edit_modal.js
@@ -14,14 +14,14 @@ function populateCertificateEditModal(client_id, certificate_id) {
             const domains = response.domains;
 
             // Populate the cert modal fields
-            document.getElementById("editHeader").innerText = certificate.certificate_name;
+            document.getElementById("editCertificateHeader").innerText = certificate.certificate_name;
             document.getElementById("editCertificateId").value = certificate_id;
             document.getElementById("editCertificateName").value = certificate.certificate_name;
-            document.getElementById("editDomain").value = certificate.certificate_domain;
-            document.getElementById("editIssuedBy").value = certificate.certificate_issued_by;
-            document.getElementById("editExpire").value = certificate.certificate_expire;
-            document.getElementById("editPublicKey").value = certificate.certificate_public_key;
-            document.getElementById("editNotes").value = certificate.certificate_notes;
+            document.getElementById("editCertificateDomain").value = certificate.certificate_domain;
+            document.getElementById("editCertificateIssuedBy").value = certificate.certificate_issued_by;
+            document.getElementById("editCertificateExpire").value = certificate.certificate_expire;
+            document.getElementById("editCertificatePublicKey").value = certificate.certificate_public_key;
+            document.getElementById("editCertificateNotes").value = certificate.certificate_notes;
 
             // Select the domain dropdown
             var domainDropdown = document.getElementById("editDomainId");