diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/AppColumnRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/AppColumnRenderer.svelte
index f6665dff28..2ad3997f79 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/AppColumnRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/AppColumnRenderer.svelte
@@ -2,4 +2,4 @@
   export let value
 </script>
 
-<div>{value.name}</div>
+<div>{value?.name || "N/A"}</div>
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
index 07551da3bc..5d3d8fa28a 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
@@ -1,7 +1,8 @@
 <script>
-  import { Avatar } from "@budibase/bbui"
+  import { Avatar, Tooltip } from "@budibase/bbui"
   export let row
 
+  let showTooltip
   const getInitials = user => {
     let initials = ""
     initials += user.firstName ? user.firstName[0] : ""
@@ -11,4 +12,34 @@
   }
 </script>
 
-<Avatar size="M" initials={getInitials(row.user)} />
+<div
+  class="container"
+  on:mouseover={() => (showTooltip = true)}
+  on:focus={() => (showTooltip = true)}
+  on:mouseleave={() => (showTooltip = false)}
+>
+  <Avatar size="M" initials={getInitials(row.user)} />
+</div>
+{#if showTooltip}
+  <div class="tooltip">
+    <Tooltip textWrapping text={row.user.email} direction="bottom" />
+  </div>
+{/if}
+
+<style>
+  .container {
+    position: relative;
+  }
+  .tooltip {
+    z-index: 1;
+    position: absolute;
+    top: 85%;
+    left: calc(90% - 8px);
+    transform: translateX(-100%) translateY(-50%);
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+    width: 130px;
+    pointer-events: none;
+  }
+</style>
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 821e504774..47c93d23d1 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -9,6 +9,8 @@
     clickOutside,
     CoreTextArea,
     DatePicker,
+    Pagination,
+    Divider,
   } from "@budibase/bbui"
   import { licensing, users, apps, auditLogs } from "stores/portal"
   import LockedFeature from "../../_components/LockedFeature.svelte"
@@ -62,16 +64,15 @@
   let startDate, endDate
 
   $: fetchUsers(userPage, userSearchTerm)
-  $: fetchLogs(
+  $: fetchLogs({
     logsPage,
     logSearchTerm,
     startDate,
     endDate,
     selectedUsers,
     selectedApps,
-    selectedEvents
-  )
-
+    selectedEvents,
+  })
   $: userPage = $userPageInfo.page
   $: logsPage = $logsPageInfo.page
 
@@ -97,38 +98,38 @@
     }
   }
 
-  const fetchLogs = async (
+  const fetchLogs = async ({
     logsPage,
-    search,
+    logSearchTerm,
     startDate,
     endDate,
     selectedUsers,
     selectedApps,
-    selectedEvents
-  ) => {
+    selectedEvents,
+  }) => {
     if ($logsPageInfo.loading) {
       return
     }
     // need to remove the page if they've started searching
-    if (search && !prevLogSearch) {
+    if (logSearchTerm && !prevLogSearch) {
       logsPageInfo.reset()
       logsPage = undefined
     }
-    prevLogSearch = search
+    prevLogSearch = logSearchTerm
     try {
       logsPageInfo.loading()
       await auditLogs.search({
-        logsPage,
+        bookmark: logsPage,
         startDate,
         endDate,
-        metadataSearch: search,
+        fullSearch: logSearchTerm,
         userIds: selectedUsers,
         appIds: selectedApps,
         events: selectedEvents,
       })
       logsPageInfo.fetched(
         $auditLogs.logs.hasNextPage,
-        $auditLogs.logs.nextPage
+        $auditLogs.logs.bookmark
       )
     } catch (error) {
       console.log(error)
@@ -161,6 +162,7 @@
   }
 
   const viewDetails = detail => {
+    console.log(detail)
     selectedLog = detail
     sidePanelVisible = true
   }
@@ -206,9 +208,15 @@
           range={true}
           label="Date Range"
           on:change={e => {
-            if (e.detail[0].length > 1) {
+            console.log(e)
+            if (e.detail[0]?.length === 1) {
+              startDate = e.detail[0][0].toISOString()
+            } else if (e.detail[0]?.length > 1) {
               startDate = e.detail[0][0].toISOString()
               endDate = e.detail[0][1].toISOString()
+            } else {
+              startDate = null
+              endDate = null
             }
           }}
         />
@@ -258,14 +266,23 @@
   </div>
   <Layout noPadding>
     <Table
+      on:click={({ detail }) => viewDetails(detail)}
       {customRenderers}
-      on:click={viewDetails}
       data={$auditLogs.logs.data}
       allowEditColumns={false}
       allowEditRows={false}
       allowSelectRows={false}
       {schema}
     />
+    <div class="pagination">
+      <Pagination
+        page={$logsPageInfo.pageNumber}
+        hasPrevPage={$logsPageInfo.loading ? false : $logsPageInfo.hasPrevPage}
+        hasNextPage={$logsPageInfo.loading ? false : $logsPageInfo.hasNextPage}
+        goToPrevPage={logsPageInfo.prevPage}
+        goToNextPage={logsPageInfo.nextPage}
+      />
+    </div>
   </Layout>
 </LockedFeature>
 
@@ -298,7 +315,9 @@
         />
       </div>
     </div>
-    <div style="padding-top: 10px; height: 95%">
+    <Divider />
+
+    <div class="side-panel-body">
       <CoreTextArea
         disabled
         minHeight={"300px"}
@@ -312,16 +331,28 @@
 <style>
   .side-panel-header {
     display: flex;
+    padding: 20px 10px 10px 10px;
     gap: var(--spacing-s);
     justify-content: space-between;
     align-items: center;
   }
 
+  .pagination {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+    margin-top: var(--spacing-xl);
+  }
+
+  .side-panel-body {
+    padding: 10px;
+    height: 95%;
+  }
   #side-panel {
     position: absolute;
     right: 0;
     top: 0;
-    padding: 24px;
+    padding-bottom: 24px;
     background: var(--background);
     border-left: var(--border-light);
     width: 320px;
@@ -330,7 +361,7 @@
     overflow-x: hidden;
     transform: translateX(100%);
     transition: transform 130ms ease-in-out;
-    height: calc(100% - 48px);
+    height: calc(100% - 25px);
     z-index: 2;
   }
   #side-panel.visible {
diff --git a/packages/builder/src/stores/portal/auditLogs.js b/packages/builder/src/stores/portal/auditLogs.js
index 3454aab95c..165e4b5ec5 100644
--- a/packages/builder/src/stores/portal/auditLogs.js
+++ b/packages/builder/src/stores/portal/auditLogs.js
@@ -26,8 +26,6 @@ export function createAuditLogsStore() {
     update(state => {
       return { ...state, ...events }
     })
-
-    console.log(events)
   }
 
   async function downloadLogs(opts = {}) {
diff --git a/packages/frontend-core/src/api/auditLogs.js b/packages/frontend-core/src/api/auditLogs.js
index 745bfbc742..867644c23c 100644
--- a/packages/frontend-core/src/api/auditLogs.js
+++ b/packages/frontend-core/src/api/auditLogs.js
@@ -1,32 +1,39 @@
 const buildOpts = ({
+  bookmark,
   userIds,
   appIds,
   startDate,
   endDate,
-  metadataSearch,
+  fullSearch,
   events,
 }) => {
   const opts = {}
 
+  if (bookmark) {
+    opts.bookmark = bookmark
+  }
+
   if (startDate && endDate) {
     opts.startDate = startDate
     opts.endDate = endDate
+  } else if (startDate && !endDate) {
+    opts.startDate = startDate
   }
 
-  if (metadataSearch) {
-    opts.metadataSearch = metadataSearch
+  if (fullSearch) {
+    opts.fullSearch = fullSearch
   }
 
-  if (events) {
-    opts.event = events
+  if (events.length) {
+    opts.events = events
   }
 
-  if (userIds) {
-    opts.userId = userIds
+  if (userIds.length) {
+    opts.userIds = userIds
   }
 
-  if (appIds) {
-    opts.appId = appIds
+  if (appIds.length) {
+    opts.appIds = appIds
   }
 
   return opts