diff --git a/src/lib/elements/forms/inputTags.svelte b/src/lib/elements/forms/inputTags.svelte
index bca3b7489..fa2b445fa 100644
--- a/src/lib/elements/forms/inputTags.svelte
+++ b/src/lib/elements/forms/inputTags.svelte
@@ -7,6 +7,7 @@
     export let placeholder = '';
     export let disabled = false;
     export let helper: string | undefined = undefined;
+    export let pattern: string | undefined = undefined;
 
     let value = '';
     let error: string;
@@ -33,7 +34,8 @@
     {id}
     {placeholder}
     {disabled}
+    {pattern}
     bind:value={tags}
     helper={error || helper}
     on:invalid={handleInvalid}
-    state={error ? 'error' : 'default'} />
+    state={error ? 'error' : 'default'}><slot name="info" slot="info" /></Input.Tags>
diff --git a/src/routes/(console)/apply-credit/+page.svelte b/src/routes/(console)/apply-credit/+page.svelte
index 7b9b817b1..ee354a553 100644
--- a/src/routes/(console)/apply-credit/+page.svelte
+++ b/src/routes/(console)/apply-credit/+page.svelte
@@ -25,6 +25,8 @@
     import { onMount } from 'svelte';
     import { writable } from 'svelte/store';
     import { plansInfo } from '$lib/stores/billing';
+    import { Fieldset, Icon, Layout, Tooltip } from '@appwrite.io/pink-svelte';
+    import { IconInfo } from '@appwrite.io/pink-icons-svelte';
 
     export let data;
 
@@ -71,6 +73,8 @@
     let campaign = data?.campaign;
     let billingPlan = BillingPlan.PRO;
 
+    $: onlyNewOrgs = (campaign && campaign.onlyNewOrgs) || (couponData && couponData.onlyNewOrgs);
+
     onMount(async () => {
         await loadPaymentMethods();
         if (!$organizationList?.total || campaign?.onlyNewOrgs) {
@@ -205,34 +209,48 @@
     <svelte:fragment slot="title">Apply credits</svelte:fragment>
     <WizardSecondaryContent>
         <Form bind:this={formComponent} onSubmit={handleSubmit} bind:isSubmitting>
-            {#if $organizationList?.total && !campaign?.onlyNewOrgs && canSelectOrg}
-                <InputSelect
-                    bind:value={selectedOrgId}
-                    label="Select organization"
-                    {options}
-                    required
-                    placeholder="Select organization"
-                    id="organization" />
-            {/if}
-            {#if selectedOrgId && (selectedOrg?.billingPlan !== BillingPlan.PRO || !selectedOrg?.paymentMethodId)}
-                {#if selectedOrgId === newOrgId}
-                    <InputText
-                        label="Organization name"
-                        placeholder="Enter organization name"
-                        id="name"
-                        required
-                        bind:value={name} />
+            <Layout.Stack gap="l">
+                <Fieldset legend="Organization">
+                    <Layout.Stack gap="l">
+                        {#if $organizationList?.total && !onlyNewOrgs && canSelectOrg}
+                            <InputSelect
+                                bind:value={selectedOrgId}
+                                label="Select organization"
+                                {options}
+                                required
+                                placeholder="Select organization"
+                                id="organization" />
+                        {/if}
+                        {#if selectedOrgId && (selectedOrg?.billingPlan !== BillingPlan.PRO || !selectedOrg?.paymentMethodId)}
+                            {#if selectedOrgId === newOrgId}
+                                <InputText
+                                    label="Organization name"
+                                    placeholder="Enter organization name"
+                                    id="name"
+                                    required
+                                    bind:value={name} />
+                            {/if}
+                            <InputTags
+                                bind:tags={collaborators}
+                                label="Invite members by email"
+                                placeholder="Enter email address(es)"
+                                pattern={emailRegex.toString()}
+                                id="members">
+                                <Tooltip slot="info">
+                                    <Icon icon={IconInfo} size="s" />
+                                    <span slot="tooltip">
+                                        Invited members will have access to all services and payment
+                                        data within your organization
+                                    </span>
+                                </Tooltip>
+                            </InputTags>
+                        {/if}
+                    </Layout.Stack>
+                </Fieldset>
+                {#if selectedOrgId && (selectedOrg?.billingPlan !== BillingPlan.PRO || !selectedOrg?.paymentMethodId)}
+                    <SelectPaymentMethod bind:methods bind:value={paymentMethodId} bind:taxId />
                 {/if}
-                <InputTags
-                    bind:tags={collaborators}
-                    label="Invite members by email"
-                    tooltip="Invited members will have access to all services and payment data within your organization"
-                    placeholder="Enter email address(es)"
-                    validityRegex={emailRegex}
-                    validityMessage="Invalid email address"
-                    id="members" />
-                <SelectPaymentMethod bind:methods bind:value={paymentMethodId} bind:taxId />
-            {/if}
+            </Layout.Stack>
         </Form>
         <Form bind:this={couponForm} onSubmit={addCoupon}>
             {#if !data?.couponData?.code && selectedOrgId}