diff --git a/client_assets.php b/client_assets.php
index 18b33601a..d7f617a78 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -431,11 +431,26 @@ class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"
                                         </div>
 
                                         <?php } ?>
-
-                                        <?php if (!empty($asset_uri)) { ?>
-                                            <a class="btn btn-default btn-sm" href="<?php echo $asset_uri; ?>" target="_blank"><i class="fas fa-fw fa-external-link-alt"></i></a>
+                                        <?php if ( !empty($asset_uri) || !empty($asset_uri_2) ) { ?>
+                                        <div class="dropdown dropleft text-center">
+                                            <button class="btn btn-default btn-sm" type="button" data-toggle="dropdown">
+                                                <i class="fa fa-fw fa-external-link-alt"></i>
+                                            </button>
+                                            <div class="dropdown-menu">
+                                                <?php if ($asset_uri) { ?>
+                                                <a href="<?php echo $asset_uri; ?>" alt="<?php echo $asset_uri; ?>" target="_blank" class="dropdown-item" >
+                                                    <i class="fa fa-fw fa-external-link-alt"></i> <?php echo truncate($asset_uri,40); ?>
+                                                </a>
+                                                <?php } ?>
+                                                <?php if ($asset_uri_2) { ?>
+                                                <div class="dropdown-divider"></div>
+                                                <a href="<?php echo $asset_uri_2; ?>" target="_blank" class="dropdown-item" >
+                                                    <i class="fa fa-fw fa-external-link-alt"></i> <?php echo truncate($asset_uri_2,40); ?>
+                                                </a>
+                                                <?php } ?>
+                                            </div>
+                                        </div>
                                         <?php } ?>
-
                                         <div class="dropdown dropleft text-center">
                                             <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown"><i class="fas fa-ellipsis-h"></i></button>
                                             <div class="dropdown-menu">
diff --git a/client_logins.php b/client_logins.php
index bc07f24fb..905248dcd 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -175,8 +175,25 @@ class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"
                                 <td><?php echo $login_uri_display; ?></td>
                                 <td class="text-center">
                                     <div class="btn-group">
-                                        <?php if ($login_uri) { ?>
-                                        <a href="<?php echo $login_uri; ?>" target="_blank" class="btn btn-default btn-sm"><i class="fa fa-fw fa-external-link-alt"></i></a>
+                                        <?php if ( !empty($login_uri) || !empty($login_uri_2) ) { ?>
+                                        <div class="dropdown dropleft text-center">
+                                            <button class="btn btn-default btn-sm" type="button" data-toggle="dropdown">
+                                                <i class="fa fa-fw fa-external-link-alt"></i>
+                                            </button>
+                                            <div class="dropdown-menu">
+                                                <?php if ($login_uri) { ?>
+                                                <a href="<?php echo $login_uri; ?>" alt="<?php echo $login_uri; ?>" target="_blank" class="dropdown-item" >
+                                                    <i class="fa fa-fw fa-external-link-alt"></i> <?php echo truncate($login_uri,40); ?>
+                                                </a>
+                                                <?php } ?>
+                                                <?php if ($login_uri_2) { ?>
+                                                <div class="dropdown-divider"></div>
+                                                <a href="<?php echo $login_uri_2; ?>" target="_blank" class="dropdown-item" >
+                                                    <i class="fa fa-fw fa-external-link-alt"></i> <?php echo truncate($login_uri_2,40); ?>
+                                                </a>
+                                                <?php } ?>
+                                            </div>
+                                        </div>
                                         <?php } ?>
                                         <div class="dropdown dropleft text-center">
                                             <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">