diff --git a/src/AliasVault.Client/Auth/Pages/Setup/Components/WelcomeStep.razor b/src/AliasVault.Client/Auth/Pages/Setup/Components/WelcomeStep.razor
deleted file mode 100644
index e0d16af9..00000000
--- a/src/AliasVault.Client/Auth/Pages/Setup/Components/WelcomeStep.razor
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="w-full max-w-md mx-auto">
-    <p class="mt-12 text-gray-600 dark:text-gray-400 mb-4 text-center">
-        AliasVault is a secure app which help you create and manage your online accounts and passwords.
-        Let's get you set up with your new vault.
-    </p>
-</div>
-
-@code {
-    /// <summary>
-    /// The event that is triggered when the user clicks the next button.
-    /// </summary>
-    [Parameter]
-    public EventCallback OnNext { get; set; }
-}
diff --git a/src/AliasVault.Client/Auth/Pages/Setup/Setup.razor b/src/AliasVault.Client/Auth/Pages/Setup/Setup.razor
index f731bc46..7a7e40db 100644
--- a/src/AliasVault.Client/Auth/Pages/Setup/Setup.razor
+++ b/src/AliasVault.Client/Auth/Pages/Setup/Setup.razor
@@ -10,7 +10,7 @@
             <div class="flex-grow p-6 pt-4 lg:pt-6 pb-28 lg:pb-4">
                 <div class="flex justify-between items-center mb-4">
                     <div>
-                        <button @onclick="GoBack" class="text-gray-500 hover:text-gray-800 dark:text-gray-400 dark:hover:text-gray-200 @(_currentStep == SetupStep.Welcome ? "invisible" : "")">
+                        <button @onclick="GoBack" class="text-gray-500 hover:text-gray-800 dark:text-gray-400 dark:hover:text-gray-200">
                             <svg class="w-8 h-8" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 19l-7-7m0 0l7-7m-7 7h18"></path>
                             </svg>
@@ -35,9 +35,6 @@
                 <EditForm Model="@_setupData" OnValidSubmit="HandleSubmit">
                     @switch (_currentStep)
                     {
-                        case SetupStep.Welcome:
-                            <WelcomeStep />
-                            break;
                         case SetupStep.TermsAndConditions:
                             <TermsAndConditionsStep
                                 AgreedToTerms="@_setupData.AgreedToTerms"
@@ -80,7 +77,7 @@
 </div>
 
 @code {
-    private SetupStep _currentStep = SetupStep.Welcome;
+    private SetupStep _currentStep = SetupStep.TermsAndConditions;
     private readonly SetupData _setupData = new();
 
     /// <summary>
@@ -88,7 +85,6 @@
     /// </summary>
     private bool IsNextEnabled => _currentStep switch
     {
-        SetupStep.Welcome => true,
         SetupStep.TermsAndConditions => _setupData.AgreedToTerms,
         SetupStep.Username => !string.IsNullOrWhiteSpace(_setupData.Username),
         SetupStep.Password => !string.IsNullOrWhiteSpace(_setupData.Password),
@@ -104,7 +100,6 @@
     {
         return step switch
         {
-            SetupStep.Welcome => "Welcome to AliasVault",
             SetupStep.TermsAndConditions => "Using AliasVault",
             SetupStep.Username => "Choose Username",
             SetupStep.Password => "Set Password",
@@ -130,9 +125,6 @@
     {
         switch (_currentStep)
         {
-            case SetupStep.TermsAndConditions:
-                _currentStep = SetupStep.Welcome;
-                break;
             case SetupStep.Username:
                 _currentStep = SetupStep.TermsAndConditions;
                 break;
@@ -152,7 +144,6 @@
     {
         _currentStep = _currentStep switch
         {
-            SetupStep.Welcome => SetupStep.TermsAndConditions,
             SetupStep.TermsAndConditions => SetupStep.Username,
             SetupStep.Username => SetupStep.Password,
             SetupStep.Password => SetupStep.Creating,
@@ -186,7 +177,6 @@
     /// </summary>
     private enum SetupStep
     {
-        Welcome,
         TermsAndConditions,
         Username,
         Password,
diff --git a/src/Tests/AliasVault.E2ETests/Tests/Client/Shard4/UserSetupTests.cs b/src/Tests/AliasVault.E2ETests/Tests/Client/Shard4/UserSetupTests.cs
index 062ceae7..e43c749a 100644
--- a/src/Tests/AliasVault.E2ETests/Tests/Client/Shard4/UserSetupTests.cs
+++ b/src/Tests/AliasVault.E2ETests/Tests/Client/Shard4/UserSetupTests.cs
@@ -32,13 +32,6 @@ public async Task UserSetupProcessTest()
         var createVaultButton = await WaitForAndGetElement("a:has-text('Create new vault')");
         await createVaultButton.ClickAsync();
 
-        // Wait for the setup page to load.
-        await WaitForUrlAsync("user/setup", "Welcome to AliasVault");
-
-        // Press the continue button.
-        var continueButton = await WaitForAndGetElement("button:has-text('Continue')");
-        await continueButton.ClickAsync();
-
         // Wait for the terms and conditions to load.
         await WaitForUrlAsync("user/setup", "Terms and Conditions");
 
@@ -50,7 +43,7 @@ public async Task UserSetupProcessTest()
         await Task.Delay(100);
 
         // Press the continue button.
-        continueButton = await WaitForAndGetElement("button:has-text('Continue')");
+        var continueButton = await WaitForAndGetElement("button:has-text('Continue')");
         await continueButton.ClickAsync();
 
         // Wait for the username step to load.
@@ -100,13 +93,6 @@ public async Task UserSetupUsernameExistsTest()
         var createVaultButton = await WaitForAndGetElement("a:has-text('Create new vault')");
         await createVaultButton.ClickAsync();
 
-        // Wait for the setup page to load.
-        await WaitForUrlAsync("user/setup", "Welcome to AliasVault");
-
-        // Press the continue button.
-        var continueButton = await WaitForAndGetElement("button:has-text('Continue')");
-        await continueButton.ClickAsync();
-
         // Wait for the terms and conditions to load.
         await WaitForUrlAsync("user/setup", "Terms and Conditions");
 
@@ -118,7 +104,7 @@ public async Task UserSetupUsernameExistsTest()
         await Task.Delay(100);
 
         // Press the continue button.
-        continueButton = await WaitForAndGetElement("button:has-text('Continue')");
+        var continueButton = await WaitForAndGetElement("button:has-text('Continue')");
         await continueButton.ClickAsync();
 
         // Wait for the username step to load.