diff --git a/src/routes/console/project-[project]/authentication/teams/[team]/activity.svelte b/src/routes/console/project-[project]/authentication/teams/[team]/activity.svelte
index da750c62a..15a0d0541 100644
--- a/src/routes/console/project-[project]/authentication/teams/[team]/activity.svelte
+++ b/src/routes/console/project-[project]/authentication/teams/[team]/activity.svelte
@@ -21,7 +21,7 @@
     $: request = sdkForProject.teams.listLogs($page.params.team, $pageLimit, offset);
 
     const getBrowser = (clientCode: string) => {
-        return sdkForProject.avatars.getBrowser(clientCode, 40, 40);
+        return sdkForProject.avatars.getBrowser(clientCode, 80, 80);
     };
 </script>
 
@@ -42,21 +42,31 @@
                     {#each response.logs as log}
                         <TableRow>
                             <TableCell title="Client">
-                                <div class="u-flex u-cross-center u-gap-12">
-                                    <div class="avatar is-small">
-                                        <img
-                                            height="20"
-                                            width="20"
-                                            src={getBrowser(log.clientCode).toString()}
-                                            alt={log.clientName} />
+                                {#if log.clientName}
+                                    <div class="u-flex u-cross-center u-gap-12">
+                                        <div class="avatar is-small">
+                                            <img
+                                                height="20"
+                                                width="20"
+                                                src={getBrowser(log.clientCode).toString()}
+                                                alt={log.clientName} />
+                                        </div>
+                                        <p class="text u-trim">
+                                            {log.clientName}
+                                            {log.clientVersion}
+                                            on {log.osName}
+                                            {log.osVersion}
+                                        </p>
                                     </div>
-                                    <p class="text u-trim">
-                                        {log.clientName}
-                                        {log.clientVersion}
-                                        on {log.osName}
-                                        {log.osVersion}
-                                    </p>
-                                </div>
+                                {:else}
+                                    <div class="u-flex u-cross-center u-gap-12">
+                                        <p class="text u-trim">
+                                            <span class="avatar  is-color-empty" />
+
+                                            Unknown
+                                        </p>
+                                    </div>
+                                {/if}
                             </TableCell>
                             <TableCellText title="Event">{log.event}</TableCellText>
 
diff --git a/src/routes/console/project-[project]/authentication/user/[user]/activity.svelte b/src/routes/console/project-[project]/authentication/user/[user]/activity.svelte
index 36677272f..2bc84cf89 100644
--- a/src/routes/console/project-[project]/authentication/user/[user]/activity.svelte
+++ b/src/routes/console/project-[project]/authentication/user/[user]/activity.svelte
@@ -14,14 +14,14 @@
     import { Container } from '$lib/layout';
     import { toLocaleDateTime } from '$lib/helpers/date';
     import { sdkForProject } from '$lib/stores/sdk';
+    import { pageLimit } from '$lib/stores/layout';
 
     let offset = 0;
-    const limit = 25;
 
-    $: request = sdkForProject.users.getLogs($page.params.user, limit, offset);
+    $: request = sdkForProject.users.getLogs($page.params.user, $pageLimit, offset);
 
     const getBrowser = (clientCode: string) => {
-        return sdkForProject.avatars.getBrowser(clientCode, 40, 40);
+        return sdkForProject.avatars.getBrowser(clientCode, 80, 80);
     };
 </script>
 
@@ -42,31 +42,37 @@
                     {#each response.logs as log}
                         <TableRow>
                             <TableCell title="Client">
-                                <div class="u-flex u-cross-center u-gap-12">
-                                    <div class="avatar is-small">
-                                        <img
-                                            height="20"
-                                            width="20"
-                                            src={getBrowser(log.clientCode).toString()}
-                                            alt={log.clientName} />
+                                {#if log.clientName}
+                                    <div class="u-flex u-cross-center u-gap-12">
+                                        <div class="avatar is-small">
+                                            <img
+                                                height="20"
+                                                width="20"
+                                                src={getBrowser(log.clientCode).toString()}
+                                                alt={log.clientName} />
+                                        </div>
+                                        <p class="text u-trim">
+                                            {log.clientName}
+                                            {log.clientVersion}
+                                            on {log.osName}
+                                            {log.osVersion}
+                                        </p>
                                     </div>
-                                    <p class="text u-trim">
-                                        {log.clientName}
-                                        {log.clientVersion}
-                                        on {log.osName}
-                                        {log.osVersion}
-                                    </p>
-                                </div>
+                                {:else}
+                                    <div class="u-flex u-cross-center u-gap-12">
+                                        <p class="text u-trim">
+                                            <span class="avatar  is-color-empty" />
+
+                                            Unknown
+                                        </p>
+                                    </div>
+                                {/if}
                             </TableCell>
                             <TableCellText title="Event">{log.event}</TableCellText>
 
                             <TableCellText title="Location">
                                 {#if log.countryCode !== '--'}
-                                    <img
-                                        src={sdkForProject.avatars
-                                            .getFlag(log.countryCode, 32, 32)
-                                            .toString()}
-                                        alt={log.countryName} />{log.countryName}
+                                    {log.countryName}
                                 {:else}
                                     Unknown
                                 {/if}
@@ -95,7 +101,7 @@
         {/if}
         <div class="u-flex u-margin-block-start-32 u-main-space-between">
             <p class="text">Total results: {response.total}</p>
-            <Pagination {limit} bind:offset sum={response.total} />
+            <Pagination limit={$pageLimit} bind:offset sum={response.total} />
         </div>
     {/await}
 </Container>