diff --git a/src/User/Framework/Entity/User.php b/src/User/Framework/Entity/User.php
index c662cd1..4c5cb0f 100644
--- a/src/User/Framework/Entity/User.php
+++ b/src/User/Framework/Entity/User.php
@@ -99,7 +99,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
      */
     public function getUserIdentifier(): string
     {
-        return (string) $this->username ?? $this->email;
+        return (string) $this->email;
     }
 
     /**
diff --git a/templates/components/DownloadList.html.twig b/templates/components/DownloadList.html.twig
index 176de78..721d642 100644
--- a/templates/components/DownloadList.html.twig
+++ b/templates/components/DownloadList.html.twig
@@ -1,4 +1,4 @@
-<div{{ attributes.defaults(stimulus_controller('download_list')) }} class="min-w-48" >
+<div{{ attributes.defaults(stimulus_controller('download_list')) }} class="min-w-48 overflow-scroll" >
     {% set table_body_id = (type == "complete") ? "complete_downloads" : "active_downloads" %}
 
     {% if this.isWidget == false %}
diff --git a/templates/components/MonitorList.html.twig b/templates/components/MonitorList.html.twig
index 681ea93..f135013 100644
--- a/templates/components/MonitorList.html.twig
+++ b/templates/components/MonitorList.html.twig
@@ -1,4 +1,4 @@
-<div{{ attributes.defaults(stimulus_controller('monitor_list')) }}>
+<div{{ attributes.defaults(stimulus_controller('monitor_list')) }} class="overflow-scroll">
     {% if this.isWidget == false %}
         <div class="flex flex-row mb-2 justify-end">
             <twig:DownloadSearch search_path="app_search" placeholder="Find {{ type == "complete" ? "a" : "an" }} {{ type }} monitor..." />