diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts
index bd3ebd58e..96e13637b 100644
--- a/src/lib/components/index.ts
+++ b/src/lib/components/index.ts
@@ -27,3 +27,4 @@ export { default as Search } from './search.svelte';
 export { default as GridItem1 } from './gridItem1.svelte';
 export { default as Steps } from './steps.svelte';
 export { default as Step } from './step.svelte';
+export { default as Secret } from './secret.svelte';
diff --git a/src/lib/components/secret.svelte b/src/lib/components/secret.svelte
new file mode 100644
index 000000000..458005a93
--- /dev/null
+++ b/src/lib/components/secret.svelte
@@ -0,0 +1,28 @@
+<script lang="ts">
+    import { Copy } from '.';
+
+    export let show = false;
+    export let value: string;
+</script>
+
+<div class="interactive-text-output" class:is-textarea={show}>
+    {#if show}
+        <span class="text u-line-height-1-5 u-break-word">{value}</span>
+    {:else}
+        <span class="text">••••••</span>
+    {/if}
+    <div class="u-flex u-cross-child-start u-gap-8">
+        <button
+            class="interactive-text-output-button"
+            aria-label="show hidden text"
+            type="button"
+            on:click={() => (show = !show)}>
+            <span class:icon-eye-off={show} class:icon-eye={!show} aria-hidden="true" />
+        </button>
+        <Copy {value}>
+            <button class="interactive-text-output-button" aria-label="copy text" type="button">
+                <span class="icon-duplicate" aria-hidden="true" />
+            </button>
+        </Copy>
+    </div>
+</div>
diff --git a/src/routes/console/project-[project]/overview/keys/+page.svelte b/src/routes/console/project-[project]/overview/keys/+page.svelte
index ebe4a4379..5f611048c 100644
--- a/src/routes/console/project-[project]/overview/keys/+page.svelte
+++ b/src/routes/console/project-[project]/overview/keys/+page.svelte
@@ -39,7 +39,7 @@
                     {key.name}
                 </TableCellText>
                 <TableCellText title="Last Accessed">
-                    {toLocaleDateTime(key.$createdAt)}
+                    {key.accessedAt ? toLocaleDateTime(key.accessedAt) : 'never'}
                 </TableCellText>
                 <TableCellText title="Expiration Date">
                     {toLocaleDateTime(key.$updatedAt)}
diff --git a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte
index a168fd26f..e84332823 100644
--- a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte
+++ b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte
@@ -2,16 +2,8 @@
     import { afterNavigate } from '$app/navigation';
     import { base } from '$app/paths';
     import { page } from '$app/stores';
-    import { CardGrid, Collapsible, CollapsibleItem } from '$lib/components';
-    import { scopes } from '$lib/constants';
-    import {
-        Button,
-        Form,
-        FormList,
-        InputChoice,
-        InputPassword,
-        InputText
-    } from '$lib/elements/forms';
+    import { CardGrid, Secret } from '$lib/components';
+    import { Button, Form, FormList, InputText } from '$lib/elements/forms';
     import InputDateTime from '$lib/elements/forms/inputDateTime.svelte';
     import { difference } from '$lib/helpers/array';
     import { toLocaleDateTime } from '$lib/helpers/date';
@@ -21,39 +13,30 @@
     import { sdkForConsole } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { project } from '../../../store';
+    import Scopes from '../scopes.svelte';
     import Delete from './delete.svelte';
     import { key } from './store';
 
     const projectId = $page.params.project;
     const keyId = $page.params.key;
-    const activeScopes = scopes.reduce((prev, next) => {
-        prev[next.scope] = false;
-
-        return prev;
-    }, {});
 
     let loaded = false;
     let showDelete = false;
     let name: string = null;
     let secret: string = null;
     let expire: string = null;
+    let scopes: string[] = null;
 
     onMount(handle);
     afterNavigate(handle);
 
     async function handle(event = null) {
-        const promise = key.load(projectId, keyId);
-        if ($key?.$id !== keyId) {
-            await promise;
-        }
+        await key.load(projectId, keyId);
 
         name ??= $key.name;
         secret ??= $key.secret;
         expire ??= $key.expire;
-        unselectAll();
-        $key.scopes.forEach((scope) => {
-            activeScopes[scope] = true;
-        });
+        scopes ??= $key.scopes;
 
         updateLayout({
             navigate: event,
@@ -120,13 +103,8 @@
 
     async function updateScopes() {
         try {
-            await sdkForConsole.projects.updateKey(
-                $project.$id,
-                $key.$id,
-                $key.name,
-                selectedScoped
-            );
-            $key.scopes = selectedScoped;
+            await sdkForConsole.projects.updateKey($project.$id, $key.$id, $key.name, scopes);
+            $key.scopes = scopes;
             addNotification({
                 type: 'success',
                 message: 'API Key scopes has been updated'
@@ -138,22 +116,6 @@
             });
         }
     }
-
-    function selectAll() {
-        for (const scope in activeScopes) {
-            activeScopes[scope] = true;
-        }
-    }
-
-    function unselectAll() {
-        for (const scope in activeScopes) {
-            activeScopes[scope] = false;
-        }
-    }
-
-    $: selectedScoped = scopes
-        .filter((scope) => activeScopes[scope.scope])
-        .map(({ scope }) => scope);
 </script>
 
 <svelte:head>
@@ -162,13 +124,14 @@
 
 <Container>
     {#if loaded}
+        {@const accessedAt = $key.accessedAt ? toLocaleDateTime($key.accessedAt) : 'never'}
         <CardGrid>
             <div>
                 <h6 class="heading-level-7">{$key.name}</h6>
             </div>
             <svelte:fragment slot="aside">
                 <p>
-                    Last accessed: {toLocaleDateTime($key.accessedAt)}<br />
+                    Last accessed: {accessedAt}<br />
                     Scopes granted: {$key.scopes.length}
                 </p>
             </svelte:fragment>
@@ -178,18 +141,9 @@
                 <h6 class="heading-level-7">API Key Secret</h6>
                 <svelte:fragment slot="aside">
                     <FormList>
-                        <InputPassword
-                            id="secret"
-                            label="API Key Secret"
-                            bind:value={secret}
-                            showPasswordButton
-                            required />
+                        <Secret bind:value={secret} />
                     </FormList>
                 </svelte:fragment>
-
-                <svelte:fragment slot="actions">
-                    <Button disabled submit>Update</Button>
-                </svelte:fragment>
             </CardGrid>
         </Form>
         <Form on:submit={updateName}>
@@ -220,35 +174,15 @@
                     practice to allow only the permissions you need to meet your project goals.
                 </p>
                 <svelte:fragment slot="aside">
-                    <div class="u-flex u-cross-center u-main-end">
-                        <Button text on:click={unselectAll}>Unselect all</Button>
-                        <Button text on:click={selectAll}>Select all</Button>
-                    </div>
-                    <Collapsible>
-                        {#each ['Authentication', 'Database', 'Functions', 'Storage', 'Other'] as category}
-                            <CollapsibleItem>
-                                <svelte:fragment slot="title">{category}</svelte:fragment>
-                                <FormList>
-                                    {#each scopes.filter((s) => s.category === category) as scope}
-                                        <InputChoice
-                                            id={scope.scope}
-                                            label={scope.scope}
-                                            bind:value={activeScopes[scope.scope]}>
-                                            {scope.description}
-                                        </InputChoice>
-                                    {/each}
-                                </FormList>
-                            </CollapsibleItem>
-                        {/each}
-                    </Collapsible>
+                    <Scopes bind:scopes />
                 </svelte:fragment>
 
                 <svelte:fragment slot="actions">
                     <Button
                         submit
                         disabled={!(
-                            difference(selectedScoped, $key.scopes).length !== 0 ||
-                            difference($key.scopes, selectedScoped).length !== 0
+                            difference(scopes, $key.scopes).length !== 0 ||
+                            difference($key.scopes, scopes).length !== 0
                         )}>Update</Button>
                 </svelte:fragment>
             </CardGrid>
@@ -278,7 +212,7 @@
                     <div class="u-flex u-gap-16">
                         <div class="u-cross-child-center u-line-height-1-5">
                             <h6 class="u-bold">{$key.name}</h6>
-                            <p>Last accessed: {toLocaleDateTime($key.accessedAt)}</p>
+                            <p>Last accessed: {accessedAt}</p>
                         </div>
                     </div>
                 </div>
diff --git a/src/routes/console/project-[project]/overview/keys/create.svelte b/src/routes/console/project-[project]/overview/keys/create.svelte
index 80765d20c..043cae7cb 100644
--- a/src/routes/console/project-[project]/overview/keys/create.svelte
+++ b/src/routes/console/project-[project]/overview/keys/create.svelte
@@ -1,32 +1,21 @@
 <script lang="ts">
     import { Modal } from '$lib/components';
-    import { scopes } from '$lib/constants';
-    import { InputText, Button, Form, FormList, InputCheckbox } from '$lib/elements/forms';
+    import { InputText, Button, Form, FormList } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { sdkForConsole } from '$lib/stores/sdk';
     import { project } from '../../.../../store';
+    import Scopes from './scopes.svelte';
 
     export let show = false;
 
-    const activeScopes = scopes.reduce((prev, next) => {
-        prev[next] = false;
-
-        return prev;
-    }, {});
-
     let name: string;
+    let scopes: string[] = [];
 
     async function create() {
         try {
-            await sdkForConsole.projects.createKey(
-                $project.$id,
-                name,
-                scopes.filter((scope) => activeScopes[scope])
-            );
+            await sdkForConsole.projects.createKey($project.$id, name, scopes);
             name = null;
-            for (const scope in activeScopes) {
-                activeScopes[scope] = false;
-            }
+            scopes = [];
             project.load($project.$id);
             show = false;
         } catch (error) {
@@ -39,13 +28,11 @@
 </script>
 
 <Form on:submit={create}>
-    <Modal bind:show>
+    <Modal bind:show size="big">
         <svelte:fragment slot="header">Create API Key</svelte:fragment>
         <FormList>
             <InputText id="name" label="Name" bind:value={name} autofocus required />
-            {#each scopes as scope}
-                <InputCheckbox id={scope} label={scope} bind:value={activeScopes[scope]} />
-            {/each}
+            <Scopes bind:scopes />
         </FormList>
         <svelte:fragment slot="footer">
             <Button submit>Register</Button>
diff --git a/src/routes/console/project-[project]/overview/keys/scopes.svelte b/src/routes/console/project-[project]/overview/keys/scopes.svelte
new file mode 100644
index 000000000..d60f14730
--- /dev/null
+++ b/src/routes/console/project-[project]/overview/keys/scopes.svelte
@@ -0,0 +1,72 @@
+<script lang="ts">
+    import { Collapsible, CollapsibleItem } from '$lib/components';
+    import { Button, FormList, InputChoice } from '$lib/elements/forms';
+    import { scopes as allScopes } from '$lib/constants';
+    import { onMount } from 'svelte';
+    import { difference } from '$lib/helpers/array';
+
+    export let scopes: string[];
+
+    let mounted = false;
+
+    onMount(() => {
+        scopes.forEach((scope) => {
+            activeScopes[scope] = true;
+        });
+        mounted = true;
+    });
+
+    function selectAll() {
+        for (const scope in activeScopes) {
+            activeScopes[scope] = true;
+        }
+    }
+
+    function unselectAll() {
+        for (const scope in activeScopes) {
+            activeScopes[scope] = false;
+        }
+    }
+
+    const activeScopes = allScopes.reduce((prev, next) => {
+        prev[next.scope] = false;
+
+        return prev;
+    }, {});
+
+    $: {
+        if (mounted) {
+            const newScopes = allScopes
+                .filter((scope) => activeScopes[scope.scope])
+                .map(({ scope }) => scope);
+            if (
+                difference(scopes, newScopes).length !== 0 ||
+                difference(newScopes, scopes).length !== 0
+            ) {
+                scopes = newScopes;
+            }
+        }
+    }
+</script>
+
+<div class="u-flex u-cross-center u-main-end">
+    <Button text on:click={unselectAll}>Unselect all</Button>
+    <Button text on:click={selectAll}>Select all</Button>
+</div>
+<Collapsible>
+    {#each ['Authentication', 'Database', 'Functions', 'Storage', 'Other'] as category}
+        <CollapsibleItem>
+            <svelte:fragment slot="title">{category}</svelte:fragment>
+            <FormList>
+                {#each allScopes.filter((s) => s.category === category) as scope}
+                    <InputChoice
+                        id={scope.scope}
+                        label={scope.scope}
+                        bind:value={activeScopes[scope.scope]}>
+                        {scope.description}
+                    </InputChoice>
+                {/each}
+            </FormList>
+        </CollapsibleItem>
+    {/each}
+</Collapsible>