diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/create.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/create.svelte
index 8981a2f17..820e71cbb 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/create.svelte
@@ -4,7 +4,7 @@
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { Modal, CustomId } from '$lib/components';
     import { Dependencies } from '$lib/constants';
-    import { Badge, Icon } from '@appwrite.io/pink-svelte';
+    import { Tag, Icon } from '@appwrite.io/pink-svelte';
     import { IconPencil } from '@appwrite.io/pink-icons-svelte';
     import { Button, InputText, InputSelect, InputPhone } from '$lib/elements/forms';
     import InputEmail from '$lib/elements/forms/inputEmail.svelte';
@@ -18,7 +18,7 @@
     let identifier = '';
     let name = '';
     let providerId = '';
-    let id: string = null;
+    let id: string | null = null;
     let showCustomId = false;
 
     const providerTypeOptions = [
@@ -115,12 +115,10 @@
 
     {#if !showCustomId}
         <div>
-            <Badge
-                variant="secondary"
-                content="Target ID"
-                on:click={() => (showCustomId = !showCustomId)}>
-                <Icon icon={IconPencil} size="s" slot="start" />
-            </Badge>
+            <Tag size="s" on:click={() => (showCustomId = !showCustomId)}>
+                <Icon icon={IconPencil} size="s" />
+                Target ID
+            </Tag>
         </div>
     {:else}
         <CustomId bind:show={showCustomId} name="Target" bind:id autofocus={false} />
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/create.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/create.svelte
index 9396eeb57..bf6375012 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/create.svelte
@@ -16,7 +16,7 @@
 
     let name: string,
         id: string | null = null,
-        error: string;
+        error: string | null = null;
     let showCustomId = false;
 
     const create = async () => {