diff --git a/client_login_bulk_assign_tags_modal.php b/client_login_bulk_assign_tags_modal.php
new file mode 100644
index 00000000..3819db74
--- /dev/null
+++ b/client_login_bulk_assign_tags_modal.php
@@ -0,0 +1,48 @@
+<div class="modal" id="bulkAssignTagsModal" 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-tags mr-2"></i>Bulk Assigning Tags</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+
+            <div class="modal-body bg-white">
+                <input type="hidden" name="bulk_remove_tags" value="0">
+
+                <div class="form-group form-check">
+                    <input type="checkbox" class="form-check-input" name="bulk_remove_tags" value="1">
+                    <label class="form-check-label text-danger">Remove Existing Tags</label>
+                </div>
+
+                <div class="form-group">
+                    <label>Tags</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
+                        </div>
+                        <select class="form-control select2" name="bulk_tags[]" data-placeholder="Add some tags" multiple>
+                            <?php
+
+                            $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 4 ORDER BY tag_name ASC");
+                            while ($row = mysqli_fetch_array($sql_tags_select)) {
+                                $tag_id_select = intval($row['tag_id']);
+                                $tag_name_select = nullable_htmlentities($row['tag_name']);
+                                ?>
+                                <option value="<?php echo $tag_id_select; ?>"><?php echo $tag_name_select; ?></option>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="modal-footer bg-white">
+                <button type="submit" name="bulk_assign_login_tags" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
+                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/client_logins.php b/client_logins.php
index 6b873853..f1dfd7bf 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -160,6 +160,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                 </button>
                                 <?php } else { ?>
+                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignTagsModal">
+                                    <i class="fas fa-fw fa-tags mr-2"></i>Assign Tags
+                                </a>
+                                    <div class="dropdown-divider"></div>
                                 <button class="dropdown-item text-danger confirm-link"
                                     type="submit" form="bulkActions" name="bulk_archive_logins">
                                     <i class="fas fa-fw fa-archive mr-2"></i>Archive
@@ -399,6 +403,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
+            <?php require_once "client_login_bulk_assign_tags_modal.php"; ?>
         </form>
         <?php require_once "pagination.php";
         ?>
diff --git a/post/user/credential.php b/post/user/credential.php
index 2fc0ca37..beaad76f 100644
--- a/post/user/credential.php
+++ b/post/user/credential.php
@@ -145,6 +145,51 @@ if (isset($_GET['delete_login'])) {
 
 }
 
+if (isset($_POST['bulk_assign_login_tags'])) {
+
+    enforceUserPermission('module_credential', 2);
+
+    // Get Selected Credential Count
+    $count = count($_POST['login_ids']);
+
+    // Assign tags to Selected Credentials
+    if (!empty($_POST['login_ids'])) {
+        foreach($_POST['login_ids'] as $login_id) {
+            $login_id = intval($login_id);
+
+            // Get Contact Details for Logging
+            $sql = mysqli_query($mysqli,"SELECT login_name, login_client_id FROM logins WHERE login_id = $login_id");
+            $row = mysqli_fetch_array($sql);
+            $login_name = sanitizeInput($row['login_name']);
+            $client_id = intval($row['login_client_id']);
+
+            if($_POST['bulk_remove_tags']) {
+                // Delete tags if chosed to do so
+                mysqli_query($mysqli, "DELETE FROM login_tags WHERE login_id = $login_id");
+            }
+
+            // Add new tags
+            foreach($_POST['bulk_tags'] as $tag) {
+                $tag = intval($tag);
+
+                $sql = mysqli_query($mysqli,"SELECT * FROM login_tags WHERE login_id = $login_id AND tag_id = $tag");
+                if (mysqli_num_rows($sql) == 0) {
+                    mysqli_query($mysqli, "INSERT INTO login_tags SET login_id = $login_id, tag_id = $tag");
+                }
+            }
+
+            //Logging
+            mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Credential', log_action = 'Modify', log_description = '$session_name added tags to $login_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $login_id");
+
+        } // End Assign Location Loop
+
+        $_SESSION['alert_message'] = "Assigned tags for <strong>$count</strong> credentials";
+    }
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if (isset($_POST['bulk_archive_logins'])) {
 
     enforceUserPermission('module_credential', 2);