diff --git a/packages/web/src/views/Onboarding/steps/waitlist/WaitlistCheck.tsx b/packages/web/src/views/Onboarding/steps/waitlist/WaitlistCheck.tsx
index 34bd23453..09fef850f 100644
--- a/packages/web/src/views/Onboarding/steps/waitlist/WaitlistCheck.tsx
+++ b/packages/web/src/views/Onboarding/steps/waitlist/WaitlistCheck.tsx
@@ -89,7 +89,7 @@ export const WaitlistCheck: React.FC<OnboardingStepProps> = ({
     try {
       const data = await WaitlistApi.getWaitlistStatus(processedInput);
       setWaitlistStatus(data);
-      setFirstName(data.firstName ?? "Sailor");
+      setFirstName(data.firstName ?? "");
 
       if ((data.isOnWaitlist && data.isInvited) || data.isActive) {
         onNext();
diff --git a/packages/web/src/views/Onboarding/steps/welcome/WelcomeScreen.tsx b/packages/web/src/views/Onboarding/steps/welcome/WelcomeScreen.tsx
index 817edb05d..6726cc953 100644
--- a/packages/web/src/views/Onboarding/steps/welcome/WelcomeScreen.tsx
+++ b/packages/web/src/views/Onboarding/steps/welcome/WelcomeScreen.tsx
@@ -46,7 +46,7 @@ export const WelcomeScreen: React.FC<WelcomeScreenProps> = ({
       onNext={onNext}
       prevBtnDisabled={true}
     >
-      <OnboardingText>Welcome, Captain {firstName}</OnboardingText>
+      <OnboardingText>Welcome, Cap&apos;n {firstName}</OnboardingText>
       <AsciiContainer>
         <AsciiArt>
           {`                        |    |    |