diff --git a/user/credentials.php b/user/credentials.php
index 90d2f047..c913029b 100644
--- a/user/credentials.php
+++ b/user/credentials.php
@@ -480,9 +480,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                                     <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                                 </a>
                                                 <div class="dropdown-divider"></div>
+                                                <?php if ($client_url) { ?>
                                                 <a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'Credential', $credential_id"; ?>)">
                                                     <i class="fas fa-fw fa-share mr-2"></i>Share
                                                 </a>
+                                                <? } ?>
                                                 <?php  if (lookupUserPermission("module_credential") >= 2) { ?>
                                                     <?php if ($credential_archived_at) { ?>
                                                         <div class="dropdown-divider"></div>
@@ -533,9 +535,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <?php
 
 require_once "modals/credential/credential_add.php";
-require_once "modals/share_modal.php";
 require_once "modals/credential/credential_export.php";
 if ($client_url) {
     require_once "modals/credential/credential_import.php";
+    require_once "modals/share_modal.php";
 }
 require_once "../includes/footer.php";
diff --git a/user/modals/credential/credential_bulk_assign_tags.php b/user/modals/credential/credential_bulk_assign_tags.php
index 202fbae0..302b4f24 100644
--- a/user/modals/credential/credential_bulk_assign_tags.php
+++ b/user/modals/credential/credential_bulk_assign_tags.php
@@ -35,11 +35,9 @@
 
                         </select>
                         <div class="input-group-append">
-                            <button class="btn btn-secondary" type="button"
-                                data-toggle="ajax-modal"
+                            <button class="btn btn-secondary ajax-modal" type="button"
                                 data-modal-size="sm"
-                                data-ajax-url="ajax/ajax_tag_add.php"
-                                data-ajax-id="4">
+                                data-modal-url="../admin/modals/tag/tag_add.php?id=4">
                                 <i class="fas fa-plus"></i>
                             </button>
                         </div>