diff --git a/apps/marketing/src/app/(marketing)/layout.tsx b/apps/marketing/src/app/(marketing)/layout.tsx
index c5f761853..a7c599b36 100644
--- a/apps/marketing/src/app/(marketing)/layout.tsx
+++ b/apps/marketing/src/app/(marketing)/layout.tsx
@@ -56,7 +56,7 @@ export default function MarketingLayout({ children }: MarketingLayoutProps) {
               />
             </div>
 
-            <div className="text-background text-center text-sm">
+            <div className="text-background text-center text-sm text-white">
               Claim your documenso public profile username now!{' '}
               <span className="hidden font-semibold md:inline">documenso.com/u/yourname</span>
               <div className="mt-1.5 block md:ml-4 md:mt-0 md:inline-block">
diff --git a/apps/web/src/app/(dashboard)/settings/profile/claim-profile-alert-dialog.tsx b/apps/web/src/app/(dashboard)/settings/profile/claim-profile-alert-dialog.tsx
index 827ea1cbe..c894113b6 100644
--- a/apps/web/src/app/(dashboard)/settings/profile/claim-profile-alert-dialog.tsx
+++ b/apps/web/src/app/(dashboard)/settings/profile/claim-profile-alert-dialog.tsx
@@ -27,15 +27,16 @@ export const ClaimProfileAlertDialog = ({ className, user }: ClaimProfileAlertDi
         variant="neutral"
       >
         <div>
-          <AlertTitle>Claim your profile</AlertTitle>
+          <AlertTitle>{user.url ? 'Update your profile' : 'Claim your profile'}</AlertTitle>
           <AlertDescription className="mr-2">
-            Profiles are coming soon! Claim your profile username now to reserve your corner of the
-            signing revolution.
+            {user.url
+              ? 'Profiles are coming soon! Update your profile username to reserve your corner of the signing revolution.'
+              : 'Profiles are coming soon! Claim your profile username now to reserve your corner of the signing revolution.'}
           </AlertDescription>
         </div>
 
         <div className="flex-shrink-0">
-          <Button onClick={() => setOpen(true)}>Claim Now</Button>
+          <Button onClick={() => setOpen(true)}>{user.url ? 'Update Now' : 'Claim Now'}</Button>
         </div>
       </Alert>
 
diff --git a/apps/web/src/components/forms/v2/signup.tsx b/apps/web/src/components/forms/v2/signup.tsx
index dbf8fc6b4..189116e01 100644
--- a/apps/web/src/components/forms/v2/signup.tsx
+++ b/apps/web/src/components/forms/v2/signup.tsx
@@ -419,8 +419,7 @@ export const SignUpFormV2 = ({
                 size="lg"
                 variant="secondary"
                 className="flex-1"
-                disabled={step === 'BASIC_DETAILS'}
-                loading={form.formState.isSubmitting}
+                disabled={step === 'BASIC_DETAILS' || form.formState.isSubmitting}
                 onClick={() => setStep('BASIC_DETAILS')}
               >
                 Back