diff --git a/src/.idea/.idea.Ombi/.idea/workspace.xml b/src/.idea/.idea.Ombi/.idea/workspace.xml
index de55774d1..5f2397863 100644
--- a/src/.idea/.idea.Ombi/.idea/workspace.xml
+++ b/src/.idea/.idea.Ombi/.idea/workspace.xml
@@ -6,9 +6,8 @@
   <component name="ChangeListManager">
     <list default="true" id="57001998-efde-494a-80b3-d7acfc91f770" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/.idea.Ombi/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Ombi/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Ombi.Core/Services/DatabaseConfigurationService.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi.Core/Services/DatabaseConfigurationService.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Ombi/ClientApp/src/app/wizard/database/database.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi/ClientApp/src/app/wizard/database/database.component.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Ombi/ClientApp/src/app/wizard/database/database.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi/ClientApp/src/app/wizard/database/database.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Ombi/Controllers/V2/WizardController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi/Controllers/V2/WizardController.cs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -379,7 +378,7 @@
   </component>
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
-    ".NET Launch Settings Profile.Ombi.executor": "Debug",
+    ".NET Launch Settings Profile.Ombi.executor": "Run",
     "git-widget-placeholder": "#5208 on wizard-database",
     "node.js.selected.package.tslint": "(autodetect)"
   }
@@ -573,32 +572,6 @@
           </properties>
           <option name="timeStamp" value="7" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Ombi/Controllers/V2/WizardController.cs</url>
-          <line>112</line>
-          <properties documentPath="C:\git\Ombi\src\Ombi\Controllers\V2\WizardController.cs" containingFunctionPresentation="Method 'DatabaseConfig'">
-            <startOffsets>
-              <option value="3846" />
-            </startOffsets>
-            <endOffsets>
-              <option value="3907" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="10" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Ombi/Controllers/V2/WizardController.cs</url>
-          <line>121</line>
-          <properties documentPath="C:\git\Ombi\src\Ombi\Controllers\V2\WizardController.cs" containingFunctionPresentation="Method 'DatabaseConfig'">
-            <startOffsets>
-              <option value="4240" />
-            </startOffsets>
-            <endOffsets>
-              <option value="4278" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="11" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>
diff --git a/src/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.html b/src/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.html
index d6cfa5fd7..f2958ccc4 100644
--- a/src/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.html
+++ b/src/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.html
@@ -34,7 +34,7 @@
             <ng-template matStepLabel>Database</ng-template>
               <wizard-database-selector (configuredDatabase)="databaseConfigured()"></wizard-database-selector>
               <button mat-button matStepperPrevious class="mat-raised-button mat-error left">Back</button>
-              <button mat-button matStepperNext class="mat-raised-button mat-accent right" data-test="nextMediaServer">Next</button>
+              <button mat-button matStepperNext class="mat-raised-button mat-accent right" data-test="nextDatabase">Next</button>
         </mat-step>
 
         <mat-step  [optional]="true">
diff --git a/src/Ombi/Controllers/V2/WizardController.cs b/src/Ombi/Controllers/V2/WizardController.cs
index 07f3d82cc..73a0e6957 100644
--- a/src/Ombi/Controllers/V2/WizardController.cs
+++ b/src/Ombi/Controllers/V2/WizardController.cs
@@ -89,7 +89,7 @@ namespace Ombi.Controllers.V2
                 _logger.LogError("Wizard has already been completed");
                 return BadRequest();
             }
-
+            var sanitizedType = config.Type.Replace(Environment.NewLine, "").Replace("\n", "").Replace("\r", "");
             _logger.LogInformation("Setting up database type: {0}", config.Type);
 
             var connectionString = string.Empty;
diff --git a/tests/cypress/features/01-wizard/wizard.ts b/tests/cypress/features/01-wizard/wizard.ts
index 7ce819d1a..53d3bfe7c 100644
--- a/tests/cypress/features/01-wizard/wizard.ts
+++ b/tests/cypress/features/01-wizard/wizard.ts
@@ -11,6 +11,7 @@ When("I visit Ombi", () => {
 
 When("I click through all of the pages", () => {
   Page.welcomeTab.next.click();
+  Page.databaseTab.next.click();
   Page.mediaServerTab.next.click();
   Page.localUserTab.next.click();
   Page.ombiConfigTab.next.click();
@@ -22,6 +23,7 @@ When("I click through all of the pages", () => {
 
  When("I click through to the user page", () => {
     Page.welcomeTab.next.click();
+    Page.databaseTab.next.click();
     Page.mediaServerTab.next.click();
  });
 
@@ -48,6 +50,6 @@ Then("I should get a notification {string}", (string) => {
 
 Then("I should be on the User tab", () => {
   Page.matStepsHeader.then((_) => {
-    cy.get('#cdk-step-label-0-2').should('have.attr', 'aria-selected', 'true');
+    cy.get('#cdk-step-label-0-3').should('have.attr', 'aria-selected', 'true');
   });
 });
\ No newline at end of file
diff --git a/tests/cypress/integration/page-objects/wizard/wizard.page.ts b/tests/cypress/integration/page-objects/wizard/wizard.page.ts
index 0b0f7d2c2..2a3bee1ec 100644
--- a/tests/cypress/integration/page-objects/wizard/wizard.page.ts
+++ b/tests/cypress/integration/page-objects/wizard/wizard.page.ts
@@ -20,6 +20,12 @@ class WelcomeTab {
     }
 }
 
+class DatabaseTab {
+    get next(): Cypress.Chainable<any> {
+        return cy.getByData('nextDatabase');
+    }
+}
+
 class MediaServerTab {
     get next(): Cypress.Chainable<any> {
         return cy.getByData('nextMediaServer');
@@ -35,6 +41,7 @@ class OmbiConfigTab {
 
 class WizardPage extends BasePage {
 
+    databaseTab: DatabaseTab;
     localUserTab: LocalUserTab;
     welcomeTab: WelcomeTab;
     mediaServerTab: MediaServerTab;
@@ -54,6 +61,7 @@ class WizardPage extends BasePage {
         this.welcomeTab = new WelcomeTab();
         this.mediaServerTab = new MediaServerTab();
         this.ombiConfigTab = new OmbiConfigTab();
+        this.databaseTab = new DatabaseTab();
     }
 
     visit(options: Cypress.VisitOptions): Cypress.Chainable<Cypress.AUTWindow>;