diff --git a/src/components/list/list.vue b/src/components/list/list.vue
index 19c52cf4b..c092da339 100644
--- a/src/components/list/list.vue
+++ b/src/components/list/list.vue
@@ -52,9 +52,10 @@
       </div>
       <div
         v-if="finalItems.length === 0 && !!$slots.empty"
-        class="list-item list-empty-content faint"
+        class="list-empty-content faint"
       >
         <slot name="empty" />
+        <slot name="load" />
       </div>
       <div class="footer">
         <button
@@ -63,6 +64,7 @@
           @click="fetchEntries"
         >
           {{ $t('general.generic_error') }}
+          {{ error }}
         </button>
         <FAIcon
           v-else-if="loading"
@@ -77,7 +79,7 @@
         >
           {{ $t('general.more') }}
         </a>
-        <span v-else-if="finalItems.length !== 0">
+        <span v-else>
           {{ $t('general.no_more') }}
         </span>
       </div>
diff --git a/src/components/settings_modal/admin_tabs/users_tab.scss b/src/components/settings_modal/admin_tabs/users_tab.scss
index 141626cc5..d5c9b3ab5 100644
--- a/src/components/settings_modal/admin_tabs/users_tab.scss
+++ b/src/components/settings_modal/admin_tabs/users_tab.scss
@@ -1,5 +1,5 @@
 .UsersTab {
-  height: 100%;
+  max-height: 100%;
   display: flex;
   flex-direction: column;
   padding: 0;
@@ -10,7 +10,7 @@
   }
 
   .splitter {
-    height: 100%;
+    max-height: 100%;
     display: flex;
     overflow-y: hidden;
   }
diff --git a/src/components/settings_modal/admin_tabs/users_tab.vue b/src/components/settings_modal/admin_tabs/users_tab.vue
index cb127b4ca..4ac4cdd08 100644
--- a/src/components/settings_modal/admin_tabs/users_tab.vue
+++ b/src/components/settings_modal/admin_tabs/users_tab.vue
@@ -135,8 +135,11 @@
         <template #item="{item}">
           <AdminUserCard :user-id="item.id" />
         </template>
+        <template #load>
+          <span> loading </span>
+        </template>
         <template #empty>
-          <span>{{ $t('admin_dash.users.no_users_found')}}</span>
+          <span> no users </span>
         </template>
       </List>
     </div>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 10ce5704b..814ba2672 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1295,7 +1295,6 @@
     "users": {
       "title": "Users",
       "local_id": "Local ID",
-      "no_users_found": "No users found",
       "labels": {
         "query": "Search",
         "nickname": "{'@'}handle",