diff --git a/ajax/ajax_admin_mail_queue_message_view.php b/ajax/ajax_admin_mail_queue_message_view.php
index 6e16384a..308d219d 100644
--- a/ajax/ajax_admin_mail_queue_message_view.php
+++ b/ajax/ajax_admin_mail_queue_message_view.php
@@ -2,6 +2,10 @@
 
 require_once '../includes/ajax_header.php';
 
+if (!isset($session_is_admin) || !$session_is_admin) {
+    exit(WORDING_ROLECHECK_FAILED . "<br>Tell your admin: Your role does not have admin access.");
+}
+
 $email_id = intval($_GET['id']);
 
 //Initialize the HTML Purifier to prevent XSS
diff --git a/ajax/ajax_asset_interface_edit.php b/ajax/ajax_asset_interface_edit.php
new file mode 100644
index 00000000..6b6f50e3
--- /dev/null
+++ b/ajax/ajax_asset_interface_edit.php
@@ -0,0 +1,331 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$interface_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM asset_interfaces 
+    LEFT JOIN assets ON asset_id = interface_asset_id
+    LEFT JOIN clients ON client_id = asset_client_id
+    WHERE interface_id = $interface_id LIMIT 1"
+);
+
+$interface_count = mysqli_num_rows($sql);
+$row = mysqli_fetch_array($sql);
+                        
+$client_id = intval($row['asset_client_id']);
+$asset_id = intval($row['interface_asset_id']);
+$network_id = intval($row['interface_network_id']);
+$asset_name = nullable_htmlentities($row['asset_name']);
+$interface_id = intval($row['interface_id']);
+$interface_name = nullable_htmlentities($row['interface_name']);
+$interface_description = nullable_htmlentities($row['interface_description']);
+$interface_type = nullable_htmlentities($row['interface_type']);
+$interface_mac = nullable_htmlentities($row['interface_mac']);
+$interface_ip = nullable_htmlentities($row['interface_ip']);
+$interface_nat_ip = nullable_htmlentities($row['interface_nat_ip']);
+$interface_ipv6 = nullable_htmlentities($row['interface_ipv6']);
+$interface_primary = intval($row['interface_primary']);
+$interface_notes = nullable_htmlentities($row['interface_notes']);
+
+// Determine the linked interface for $interface_id
+$linked_interface_id = null;
+$sql_link = mysqli_query($mysqli, "
+    SELECT interface_a_id, interface_b_id
+    FROM asset_interface_links
+    WHERE interface_a_id = $interface_id
+       OR interface_b_id = $interface_id
+    LIMIT 1
+");
+if ($link_row = mysqli_fetch_assoc($sql_link)) {
+    if ($link_row['interface_a_id'] == $interface_id) {
+        $linked_interface_id = intval($link_row['interface_b_id']);
+    } else {
+        $linked_interface_id = intval($link_row['interface_a_id']);
+    }
+}
+
+// Build the dynamic modal title
+$title = "<i class='fa fa-fw fa-ethernet mr-2'></i>Editing Interface: $asset_name - <strong>$interface_name</strong>";
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token']; ?>">
+    <input type="hidden" name="interface_id" value="<?php echo $interface_id; ?>">
+
+    <div class="modal-body bg-white" <?php if (lookupUserPermission('module_support') <= 1) { echo 'inert'; } ?>>  
+
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-interface-details<?php echo $interface_id; ?>">Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-interface-network<?php echo $interface_id; ?>">Network</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-interface-notes<?php echo $interface_id; ?>">Notes</a>
+            </li>
+        </ul>
+
+        <hr>
+
+        <div class="tab-content">
+
+            <div class="tab-pane fade show active" id="pills-interface-details<?php echo $interface_id; ?>">  
+
+                <!-- Interface Name -->
+                <div class="form-group">
+                    <label>Interface Name or Port / <span class="text-secondary">Primary</span></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                        </div>
+                        <input 
+                            type="text" 
+                            class="form-control" 
+                            name="name"
+                            placeholder="Interface name or port number" 
+                            maxlength="200"
+                            value="<?php echo $interface_name; ?>"
+                            required
+                        >
+                        <div class="input-group-append">
+                            <div class="input-group-text">
+                                <input type="checkbox" name="primary_interface" value="1" <?php if($interface_primary) { echo "checked"; } ?> title="Mark Interface as primary">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- Interface Description -->
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                        </div>
+                        <input 
+                            type="text" 
+                            class="form-control" 
+                            name="description"
+                            placeholder="Short Description" 
+                            maxlength="200"
+                            value="<?php echo $interface_description; ?>"
+                        >
+                    </div>
+                </div>
+
+                <!-- Type -->
+                <div class="form-group">
+                    <label for="network">Type</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-plug"></i></span>
+                        </div>
+                        <select class="form-control select2" name="type">
+                            <option value="">- Select Type -</option>
+                            <?php foreach($interface_types_array as $interface_type_select) { ?>
+                                <option <?php if($interface_type == $interface_type_select) { echo "selected"; } ?>>
+                                    <?php echo $interface_type_select; ?>   
+                                </option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+            </div> <!-- End Details -->
+
+            <!-- Network Section -->
+            <div class="tab-pane fade" id="pills-interface-network<?php echo $interface_id; ?>">
+
+                <!-- MAC Address -->
+                <div class="form-group">
+                    <label>MAC Address</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                        </div>
+                        <input 
+                            type="text" 
+                            class="form-control" 
+                            name="mac"
+                            placeholder="MAC Address" 
+                            maxlength="200"
+                            value="<?php echo $interface_mac; ?>"
+                            data-inputmask="'alias': 'mac'"
+                            data-mask
+                        >
+                    </div>
+                </div>
+
+                <!-- IPv4 or DHCP -->
+                <div class="form-group">
+                    <label>IPv4 or DHCP</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                        </div>
+                        <input 
+                            type="text" 
+                            class="form-control" 
+                            name="ip"
+                            placeholder="IP Address" 
+                            maxlength="200"
+                            value="<?php echo $interface_ip; ?>"
+                            data-inputmask="'alias': 'ip'"
+                            data-mask
+                        >
+                        <div class="input-group-append">
+                            <div class="input-group-text">
+                                <input 
+                                    type="checkbox" 
+                                    name="dhcp" 
+                                    value="1"
+                                    title="Check to mark address as DHCP controlled"
+                                    <?php if ($interface_ip === 'DHCP') echo "checked"; ?>
+                                >
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- NAT IP -->
+                <div class="form-group">
+                    <label>NAT IP</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                        </div>
+                        <input 
+                            type="text" 
+                            class="form-control" 
+                            name="nat_ip"
+                            placeholder="Nat IP" 
+                            maxlength="200"
+                            value="<?php echo $interface_nat_ip; ?>"
+                            data-inputmask="'alias': 'ip'"
+                            data-mask
+                        >
+                    </div>
+                </div>
+
+                <!-- IPv6 -->
+                <div class="form-group">
+                    <label>IPv6</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                        </div>
+                        <input 
+                            type="text" 
+                            class="form-control" 
+                            name="ipv6"
+                            placeholder="IPv6 Address" 
+                            maxlength="200"
+                            value="<?php echo $interface_ipv6; ?>"
+                        >
+                    </div>
+                </div>
+
+                <!-- Network -->
+                <div class="form-group">
+                    <label>Network</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
+                        </div>
+                        <select class="form-control select2" name="network">
+                            <option value="">- Select Network -</option>
+                            <?php
+                            $sql_network_select = mysqli_query($mysqli, "
+                                SELECT network_id, network_name, network
+                                FROM networks
+                                WHERE network_archived_at IS NULL
+                                  AND network_client_id = $client_id
+                                ORDER BY network_name ASC
+                            ");
+                            while ($net_row = mysqli_fetch_array($sql_network_select)) {
+                                $network_id_select   = intval($net_row['network_id']);
+                                $network_name_select = nullable_htmlentities($net_row['network_name']);
+                                $network_select      = nullable_htmlentities($net_row['network']);
+
+                                $selected = ($network_id == $network_id_select) ? 'selected' : '';
+                                echo "<option value='$network_id_select' $selected>$network_name_select - $network_select</option>";
+                            }
+                            ?>
+                        </select>
+                    </div>
+                </div>
+
+                <!-- Connected to (One-to-One) -->
+                <div class="form-group">
+                    <label>Connected to</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
+                        </div>
+                        <select class="form-control select2" name="connected_to">
+                            <option value="">- Select Asset and Interface -</option>
+                            <?php
+                            $sql_interfaces_select = mysqli_query($mysqli, "
+                                SELECT i.interface_id, i.interface_name, a.asset_name
+                                FROM asset_interfaces i
+                                LEFT JOIN assets a ON a.asset_id = i.interface_asset_id
+                                WHERE a.asset_archived_at IS NULL
+                                  AND a.asset_client_id = $client_id
+                                  AND i.interface_id != $interface_id
+                                  AND a.asset_id != $asset_id
+                                  AND (
+                                       (
+                                         i.interface_id NOT IN (SELECT interface_a_id FROM asset_interface_links)
+                                         AND i.interface_id NOT IN (SELECT interface_b_id FROM asset_interface_links)
+                                       )
+                                       OR i.interface_id = " . (int)$linked_interface_id . "
+                                  )
+                                ORDER BY a.asset_name ASC, i.interface_name ASC
+                            ");
+                            while ($row_if = mysqli_fetch_array($sql_interfaces_select)) {
+                                $iface_id_select = intval($row_if['interface_id']);
+                                $iface_name_select = nullable_htmlentities($row_if['interface_name']);
+                                $iface_asset_name_select = nullable_htmlentities($row_if['asset_name']);
+
+                                $selected = ($linked_interface_id === $iface_id_select) ? 'selected' : '';
+                                echo "<option value='$iface_id_select' $selected>";
+                                echo "$iface_asset_name_select - $iface_name_select";
+                                echo "</option>";
+                            }
+                            ?>
+                        </select>
+                    </div>
+                </div>
+
+            </div> <!-- End Network Section -->
+
+            <!-- Notes Section -->
+            <div class="tab-pane fade" id="pills-interface-notes<?php echo $interface_id; ?>">
+                <!-- Notes -->
+                <div class="form-group">
+                    <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $interface_notes; ?></textarea>
+                </div>
+            </div>
+            <!-- End Notes Section -->
+
+        </div>
+
+    </div>
+    <!-- End Footer Section -->
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_asset_interface" class="btn btn-primary text-bold">
+            <i class="fas fa-check mr-2"></i>Save
+        </button>
+        <button type="button" class="btn btn-light" data-dismiss="modal">
+            <i class="fas fa-times mr-2"></i>Close
+        </button>
+    </div>
+</form>
+
+<?php
+require_once "../includes/ajax_footer.php";
diff --git a/client_asset_details.php b/client_asset_details.php
index 443d7b8c..cdae71c3 100644
--- a/client_asset_details.php
+++ b/client_asset_details.php
@@ -439,7 +439,10 @@ if (isset($_GET['asset_id'])) {
                                 <tr>
                                     <td>
                                         <i class="fa fa-fw fa-ethernet text-secondary mr-1"></i>
-                                        <a class="text-dark" href="#" data-toggle="modal" data-target="#editAssetInterfaceModal<?php echo $interface_id; ?>">
+                                        <a class="text-dark" href="#" 
+                                            data-toggle="ajax-modal"
+                                            data-ajax-url="ajax/ajax_asset_interface_edit.php"
+                                            data-ajax-id="<?php echo $interface_id; ?>">
                                             <?php echo $interface_name; ?> <?php if($interface_primary) { echo "<small class='text-primary'>(Primary)</small>"; } ?>
                                         </a>
                                     </td>
@@ -454,7 +457,10 @@ if (isset($_GET['asset_id'])) {
                                                 <i class="fas fa-ellipsis-h"></i>
                                             </button>
                                             <div class="dropdown-menu">
-                                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editAssetInterfaceModal<?php echo $interface_id; ?>">
+                                                <a class="dropdown-item" href="#"
+                                                    data-toggle="ajax-modal"
+                                                    data-ajax-url="ajax/ajax_asset_interface_edit.php"
+                                                    data-ajax-id="<?php echo $interface_id; ?>">
                                                     <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                                 </a>
                                                 <?php if ($session_user_role == 3 && $interface_primary == 0): ?>
@@ -467,8 +473,6 @@ if (isset($_GET['asset_id'])) {
                                         </div>
                                     </td>
                                 </tr>
-
-                                <?php require "modals/client_asset_interface_edit_modal.php"; ?>
                             <?php } ?>
                             </tbody>
                         </table>