diff --git a/src/routes/console/_createOrganization.svelte b/src/routes/console/_createOrganization.svelte
index 787fab444..a5967732d 100644
--- a/src/routes/console/_createOrganization.svelte
+++ b/src/routes/console/_createOrganization.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
-    import { Modal } from '$lib/components';
-    import { InputText, Button, Form } from '$lib/elements/forms';
+    import { Modal, InnerModal } from '$lib/components';
+    import { Pill } from '$lib/elements';
+    import { InputText, Button, Form, FormList } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { sdkForConsole } from '$lib/stores/sdk';
     import { createEventDispatcher } from 'svelte';
@@ -10,28 +11,71 @@
     const dispatch = createEventDispatcher();
 
     let name: string;
+    let id: string;
+    let showDropdown = false;
+    let error: string;
 
     const create = async () => {
         try {
-            await sdkForConsole.teams.create('unique()', name);
+            await sdkForConsole.teams.create(id ?? 'unique()', name);
             name = null;
             dispatch('created');
-        } catch (error) {
             addNotification({
-                type: 'error',
-                message: error.message
+                type: 'success',
+                message: `${name} has been created`
             });
+        } catch ({ message }) {
+            error = message;
         }
     };
 </script>
 
 <Form on:submit={create}>
-    <Modal bind:show>
-        <svelte:fragment slot="header">Create Project</svelte:fragment>
-        <InputText id="name" label="Name" bind:value={name} required />
+    <Modal {error} size="big" bind:show>
+        <svelte:fragment slot="header">Create New Organization</svelte:fragment>
+        <FormList>
+            <InputText id="name" label="Name" bind:value={name} required />
+            {#if !showDropdown}
+                <div>
+                    <Pill button on:click={() => (showDropdown = !showDropdown)}>
+                        <span class="icon-pencil" aria-hidden="true" /><span class="text">
+                            Organization ID
+                        </span>
+                    </Pill>
+                </div>
+            {:else}
+                <InnerModal bind:show={showDropdown}>
+                    <svelte:fragment slot="title">Organization ID</svelte:fragment>
+                    <svelte:fragment slot="subtitle">
+                        Enter a custom organization ID. Leave blank for a randomly generated one.
+                    </svelte:fragment>
+                    <svelte:fragment slot="content">
+                        <div class="form">
+                            <InputText
+                                id="id"
+                                label="Custom ID"
+                                showLabel={false}
+                                placeholder="Enter ID"
+                                autofocus={true}
+                                bind:value={id} />
+
+                            <div class="u-flex u-gap-4 u-margin-block-start-8 u-small">
+                                <span
+                                    class="icon-info u-cross-center u-margin-block-start-2 u-line-height-1 u-icon-small"
+                                    aria-hidden="true" />
+                                <span class="text u-line-height-1-5">
+                                    Allowed characters: alphanumeric, hyphen, non-leading
+                                    underscore, period
+                                </span>
+                            </div>
+                        </div>
+                    </svelte:fragment>
+                </InnerModal>
+            {/if}
+        </FormList>
         <svelte:fragment slot="footer">
-            <Button submit>Create</Button>
             <Button secondary on:click={() => (show = false)}>Cancel</Button>
+            <Button submit>Create</Button>
         </svelte:fragment>
     </Modal>
 </Form>
diff --git a/src/routes/console/_createProject.svelte b/src/routes/console/_createProject.svelte
index 20a9f521b..fbf906e07 100644
--- a/src/routes/console/_createProject.svelte
+++ b/src/routes/console/_createProject.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
-    import { Modal } from '$lib/components';
-    import { InputText, Button, InputCustomId, Form } from '$lib/elements/forms';
+    import { Modal, InnerModal } from '$lib/components';
+    import { Pill } from '$lib/elements';
+    import { InputText, Button, Form, FormList } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { sdkForConsole } from '$lib/stores/sdk';
     import { createEventDispatcher } from 'svelte';
@@ -12,29 +13,70 @@
 
     let id: string;
     let name: string;
+    let showDropdown = false;
+    let error: string;
 
     const create = async () => {
         try {
-            const project = await sdkForConsole.projects.create(id, name, teamId);
+            const project = await sdkForConsole.projects.create(id ?? 'unique()', name, teamId);
             id = name = null;
             dispatch('created', project);
-        } catch (error) {
             addNotification({
-                type: 'error',
-                message: error.message
+                type: 'success',
+                message: `${name} has been created`
             });
+        } catch ({ message }) {
+            error = message;
         }
     };
 </script>
 
 <Form on:submit={create}>
-    <Modal bind:show>
+    <Modal {error} size="big" bind:show>
         <svelte:fragment slot="header">Create Project</svelte:fragment>
-        <InputCustomId id="id" label="ID" bind:value={id} required />
-        <InputText id="name" label="Name" bind:value={name} required />
+        <FormList>
+            <InputText id="name" label="Name" bind:value={name} required />
+            {#if !showDropdown}
+                <div>
+                    <Pill button on:click={() => (showDropdown = !showDropdown)}>
+                        <span class="icon-pencil" aria-hidden="true" /><span class="text">
+                            Project ID
+                        </span>
+                    </Pill>
+                </div>
+            {:else}
+                <InnerModal bind:show={showDropdown}>
+                    <svelte:fragment slot="title">Project ID</svelte:fragment>
+                    <svelte:fragment slot="subtitle">
+                        Enter a custom project ID. Leave blank for a randomly generated one.
+                    </svelte:fragment>
+                    <svelte:fragment slot="content">
+                        <div class="form">
+                            <InputText
+                                id="id"
+                                label="Custom ID"
+                                showLabel={false}
+                                placeholder="Enter ID"
+                                autofocus={true}
+                                bind:value={id} />
+
+                            <div class="u-flex u-gap-4 u-margin-block-start-8 u-small">
+                                <span
+                                    class="icon-info u-cross-center u-margin-block-start-2 u-line-height-1 u-icon-small"
+                                    aria-hidden="true" />
+                                <span class="text u-line-height-1-5">
+                                    Allowed characters: alphanumeric, hyphen, non-leading
+                                    underscore, period
+                                </span>
+                            </div>
+                        </div>
+                    </svelte:fragment>
+                </InnerModal>
+            {/if}
+        </FormList>
         <svelte:fragment slot="footer">
-            <Button submit>Create</Button>
             <Button secondary on:click={() => (show = false)}>Cancel</Button>
+            <Button submit>Create</Button>
         </svelte:fragment>
     </Modal>
 </Form>