diff --git a/client_contact_details.php b/client_contact_details.php
index 2685a3a3..95706c34 100644
--- a/client_contact_details.php
+++ b/client_contact_details.php
@@ -43,6 +43,17 @@ if (isset($_GET['contact_id'])) {
     $sql_related_assets = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1 WHERE asset_contact_id = $contact_id ORDER BY asset_name DESC");
     $asset_count = mysqli_num_rows($sql_related_assets);
 
+    // Linked Software Licenses
+    $sql_linked_software = mysqli_query($mysqli, "SELECT * FROM software_contacts, software
+        WHERE software_contacts.contact_id = $contact_id 
+        AND software_contacts.software_id = software.software_id
+        AND software_archived_at IS NULL
+        ORDER BY software_name ASC"
+    );
+    $software_count = mysqli_num_rows($sql_linked_software);
+
+    $linked_software = array();
+
     // Related Logins Query 1 to 1 relationship
     $sql_related_logins = mysqli_query($mysqli, "SELECT * FROM logins
         LEFT JOIN login_tags ON login_tags.login_id = logins.login_id
@@ -53,18 +64,6 @@ if (isset($_GET['contact_id'])) {
     ");
     $login_count = mysqli_num_rows($sql_related_logins);
 
-    // Related Software Query - many to many relationship
-    //$sql_related_software = mysqli_query($mysqli, "SELECT * FROM software, software_contacts WHERE software.software_id = software_contacts.software_id AND software_contacts.contact_id = $contact_id ORDER BY software.software_id DESC");
-    $sql_related_software = mysqli_query(
-        $mysqli,
-        "SELECT * FROM software_contacts 
-        LEFT JOIN software ON software_contacts.software_id = software.software_id 
-        WHERE software_contacts.contact_id = $contact_id 
-        ORDER BY software.software_id DESC"
-    );
-
-    $software_count = mysqli_num_rows($sql_related_software);
-
     // Related Tickets Query - 1 to 1 relationship
     $sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets
         LEFT JOIN users ON ticket_assigned_to = user_id
@@ -242,7 +241,7 @@ if (isset($_GET['contact_id'])) {
                             <i class="fa fa-fw fa-desktop mr-2"></i>Asset
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#createContactNoteModal<?php echo $contact_id; ?>">
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#linkSoftwareModal">
                             <i class="fa fa-fw fa-cube mr-2"></i>License
                         </a>
                         <div class="dropdown-divider"></div>
@@ -545,8 +544,13 @@ if (isset($_GET['contact_id'])) {
             </div>
 
             <div class="card card-dark <?php if ($software_count == 0) { echo "d-none"; } ?>">
-                <div class="card-header">
-                    <h3 class="card-title"><i class="fa fa-fw fa-cube mr-2"></i>Related Licenses</h3>
+                <div class="card-header py-2">
+                    <h3 class="card-title mt-2"><i class="fa fa-fw fa-cube mr-2"></i>Related Licenses</h3>
+                    <div class="card-tools">
+                        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#linkSoftwareModal">
+                            <i class="fas fa-link mr-2"></i>Link License
+                        </button>
+                    </div>
                 </div>
                 <div class="card-body">
                     <div class="table-responsive-sm">
@@ -557,12 +561,13 @@ if (isset($_GET['contact_id'])) {
                                 <th>Type</th>
                                 <th>License Type</th>
                                 <th>Seats</th>
+                                <th class="text-center">Action</th>
                             </tr>
                             </thead>
                             <tbody>
                             <?php
 
-                            while ($row = mysqli_fetch_array($sql_related_software)) {
+                            while ($row = mysqli_fetch_array($sql_linked_software)) {
                                 $software_id = intval($row['software_id']);
                                 $software_name = nullable_htmlentities($row['software_name']);
                                 $software_version = nullable_htmlentities($row['software_version']);
@@ -594,12 +599,17 @@ if (isset($_GET['contact_id'])) {
                                 }
                                 $contact_licenses = implode(',', $contact_licenses_array);
 
+                                $linked_software[] = $software_id;
+
                                 ?>
                                 <tr>
-                                    <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editSoftwareModal<?php echo $software_id; ?>"><?php echo "$software_name<br><span class='text-secondary'>$software_version</span>"; ?></a></td>
+                                    <td><?php echo "$software_name $software_version"; ?></td>
                                     <td><?php echo $software_type; ?></td>
                                     <td><?php echo $software_license_type; ?></td>
                                     <td><?php echo "$seat_count / $software_seats"; ?></td>
+                                    <td class="text-center">
+                                        <a href="post.php?unlink_software_from_contact&contact_id=<?php echo $contact_id; ?>&software_id=<?php echo $software_id; ?>" class="btn btn-secondary btn-sm" title="Remove License"><i class="fas fa-fw fa-unlink"></i></a>
+                                    </td>
                                 </tr>
 
                                 <?php
@@ -1030,6 +1040,7 @@ if (isset($_GET['contact_id'])) {
 require_once "client_contact_create_note_modal.php";
 require_once "ticket_add_modal.php";
 require_once "client_contact_link_asset_modal.php";
+require_once "client_contact_link_software_modal.php";
 require_once "client_contact_link_credential_modal.php";
 require_once "client_contact_link_service_modal.php";
 require_once "client_contact_link_document_modal.php";
diff --git a/client_contact_link_software_modal.php b/client_contact_link_software_modal.php
new file mode 100644
index 00000000..b79014dd
--- /dev/null
+++ b/client_contact_link_software_modal.php
@@ -0,0 +1,58 @@
+<div class="modal" id="linkSoftwareModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-cube mr-2"></i>License Software to <strong><?php echo $contact_name; ?></strong></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
+                <div class="modal-body bg-white">
+
+                    <div class="form-group">
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                            </div>
+                            <select class="form-control select2" name="software_id">
+                                <option value="">- Select a User Software License -</option>
+                                <?php
+                                // Check if there are any associated sofctware
+                                if (!empty($linked_software)) {
+                                    $excluded_software_ids = implode(",", $linked_software);
+                                    $exclude_condition = "AND software_id NOT IN ($excluded_software_ids)";
+                                } else {
+                                    $exclude_condition = "";  // No condition if there are no displayed software
+                                }
+
+                                $sql_software_select = mysqli_query($mysqli, "SELECT * FROM software
+                                    WHERE software_client_id = $client_id
+                                    AND software_archived_at IS NULL
+                                    AND software_license_type = 'User'
+                                    $exclude_condition
+                                    ORDER BY software_name ASC"
+                                );
+                                while ($row = mysqli_fetch_array($sql_software_select)) {
+                                    $software_id = intval($row['software_id']);
+                                    $software_name = nullable_htmlentities($row['software_name']);
+
+                                    ?>
+                                    <option value="<?php echo $software_id ?>"><?php echo $software_name; ?></option>
+                                    <?php
+                                }
+                                ?>
+
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="link_software_to_contact" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/post/user/contact.php b/post/user/contact.php
index 6f3cdfcc..f1c4ce2f 100644
--- a/post/user/contact.php
+++ b/post/user/contact.php
@@ -938,6 +938,65 @@ if (isset($_GET['unlink_asset_from_contact'])) {
 
 }
 
+if (isset($_POST['link_software_to_contact'])) {
+
+    enforceUserPermission('module_support', 2);
+
+    $software_id = intval($_POST['software_id']);
+    $contact_id = intval($_POST['contact_id']);
+
+    // Get software Name and Client ID for logging
+    $sql_software = mysqli_query($mysqli,"SELECT software_name, software_client_id FROM software WHERE software_id = $software_id");
+    $row = mysqli_fetch_array($sql_software);
+    $software_name = sanitizeInput($row['software_name']);
+    $client_id = intval($row['software_client_id']);
+
+    // Get Contact Name for logging
+    $sql_contact = mysqli_query($mysqli,"SELECT contact_name FROM contacts WHERE contact_id = $contact_id");
+    $row = mysqli_fetch_array($sql_contact);
+    $contact_name = sanitizeInput($row['contact_name']);
+
+    mysqli_query($mysqli,"INSERT INTO software_contacts SET contact_id = $contact_id, software_id = $software_id");
+
+    // Logging
+    logAction("Software", "Link", "$session_name added software license $software_name to contact $contact_name", $client_id, $software_id);
+
+    $_SESSION['alert_message'] = "Software <strong>$software_name</strong> licensed for contact <strong>$contact_name</strong>";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
+if (isset($_GET['unlink_software_from_contact'])) {
+
+    enforceUserPermission('module_support', 2);
+
+    $contact_id = intval($_GET['contact_id']);
+    $software_id = intval($_GET['software_id']);
+
+    // Get software Name and Client ID for logging
+    $sql_software = mysqli_query($mysqli,"SELECT software_name, software_client_id FROM software WHERE software_id = $software_id");
+    $row = mysqli_fetch_array($sql_software);
+    $software_name = sanitizeInput($row['software_name']);
+    $client_id = intval($row['software_client_id']);
+
+    // Get Contact Name for logging
+    $sql_contact = mysqli_query($mysqli,"SELECT contact_name FROM contacts WHERE contact_id = $contact_id");
+    $row = mysqli_fetch_array($sql_contact);
+    $contact_name = sanitizeInput($row['contact_name']);
+
+    mysqli_query($mysqli,"DELETE FROM software_contacts WHERE contact_id = $contact_id AND software_id = $software_id");
+
+    //Logging
+    logAction("software", "Unlink", "$session_name removed software license $software_name from contact $contact_name", $client_id, $software_id);
+
+    $_SESSION['alert_type'] = "error";
+    $_SESSION['alert_message'] = "Removed Software License <strong>$software_name</strong> for Contact <strong>$contact_name</strong>";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if (isset($_POST['link_contact_to_credential'])) {
 
     enforceUserPermission('module_support', 2);