diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index 933aa1c..4c75765 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -8,6 +8,7 @@ import { LoginComponent } from './login.component';
 import { RegisterComponent } from './register.component';
 
 import { PagesRoutingModule } from './pages-routing.module';
+import { TabsModule } from 'ngx-bootstrap/tabs';
 
 @NgModule({
   imports: [
@@ -15,6 +16,7 @@ import { PagesRoutingModule } from './pages-routing.module';
 	PagesRoutingModule,
 	FormsModule,
 	ReactiveFormsModule,
+	TabsModule
   ],
   declarations: [
     P404Component,
diff --git a/src/app/pages/register.component.html b/src/app/pages/register.component.html
index 3cb4584..d6bfc6f 100644
--- a/src/app/pages/register.component.html
+++ b/src/app/pages/register.component.html
@@ -7,26 +7,19 @@
 		    <h1>Register</h1>
             <p class="text-muted">Create your account</p>
 			
-			<div class="input-group mb-3">
+			<!-- <div class="input-group mb-3">
 				<span class="input-group-addon"><i class="icon-people"></i></span>
                 <select required class="form-control" type="text" formControlName="usertype">
                   <option value=''>Please select</option>
-				  <option value='customer'>Customer</option>
 				  <option value='organisation'>Organisation</option>
+				  <option value='customer'>Customer</option>
                 </select>
-            </div>
-			
-			<form *ngIf="showtradersignup" [formGroup]="signup.getForm()" (ngSubmit)="onSubmit()">
-            
+            </div> -->
+			<form [formGroup]="signup.getForm()" (ngSubmit)="onSubmit()">
 			<div class="input-group mb-3">
               <span class="input-group-addon"><i class="icon-key"></i></span>
               <input type="text" class="form-control" formControlName="token" placeholder="Token">
             </div>
-			
-			<div class="input-group mb-3">
-              <span class="input-group-addon"><i class="icon-user"></i></span>
-              <input type="text" class="form-control" formControlName="name" placeholder="Organisation Name">
-            </div>
 
             <div class="input-group mb-3">
               <span class="input-group-addon">@</span>
@@ -34,21 +27,6 @@
             </div>
 			
 			<div class="input-group mb-3">
-              <span class="input-group-addon"><i class="icon-user"></i></span>
-              <input type="text" class="form-control" formControlName="street_name" placeholder="Street Name">
-            </div>
-			
-			<div class="input-group mb-3">
-              <span class="input-group-addon"><i class="icon-user"></i></span>
-              <input type="text" class="form-control" formControlName="town" placeholder="Town">
-            </div>
-			
-			<div class="input-group mb-3">
-              <span class="input-group-addon"><i class="icon-user"></i></span>
-              <input type="text" class="form-control" formControlName="postcode" placeholder="Postcode">
-            </div>
-
-            <div class="input-group mb-3">
               <span class="input-group-addon"><i class="icon-lock"></i></span>
               <input type="password" class="form-control" formControlName="password" placeholder="Password">
             </div>
@@ -57,35 +35,28 @@
               <span class="input-group-addon"><i class="icon-lock"></i></span>
               <input type="password" class="form-control" formControlName="confirmpassword" placeholder="Repeat password">
             </div>
-
-            <button type="submit" class="btn btn-block btn-success">Create Account</button>
-            </form>
 			
-			<form *ngIf="showcustomersignup" [formGroup]="signup.getForm()" (ngSubmit)="onSubmit()">
-            
 			<div class="input-group mb-3">
-              <span class="input-group-addon"><i class="icon-key"></i></span>
-              <input type="text" class="form-control" formControlName="token" placeholder="Token">
+				<span class="input-group-addon"><i class="icon-people"></i></span>
+                <select required class="form-control" type="text" formControlName="usertype">
+                  <option value=''>Please select</option>
+				  <option value='organisation'>Organisation</option>
+				  <option value='customer'>Customer</option>
+                </select>
+            </div>
+			</form>
+			
+			<div [ngSwitch]="signup.getForm().value.usertype">
+			<div *ngSwitchCase="'customer'" >
+			<form [formGroup]="signup.getForm()" (ngSubmit)="onSubmit()">
+			<div class="input-group mb-3">
+              <span class="input-group-addon"><i class="icon-user"></i></span>
+              <input type="text" class="form-control" formControlName="display_name" placeholder="Display Name">
             </div>
 			
 			<div class="input-group mb-3">
               <span class="input-group-addon"><i class="icon-user"></i></span>
-              <input type="text" class="form-control" formControlName="name" placeholder="Organisation Name">
-            </div>
-			
-			<div class="input-group mb-3">
-              <span class="input-group-addon"><i class="icon-user"></i></span>
-              <input type="text" class="form-control" formControlName="full_name" placeholder="Username">
-            </div>
-			
-			<div class="input-group mb-3">
-              <span class="input-group-addon"><i class="icon-user"></i></span>
-              <input type="text" class="form-control" formControlName="display_name" placeholder="Full Name">
-            </div>
-
-            <div class="input-group mb-3">
-              <span class="input-group-addon">@</span>
-              <input type="text" class="form-control" formControlName="email" placeholder="Email">
+              <input type="text" class="form-control" formControlName="full_name" placeholder="Full Name">
             </div>
 			
 			<div class="input-group mb-3">
@@ -100,18 +71,36 @@
                 </select>
             </div>
 
-            <div class="input-group mb-3">
-              <span class="input-group-addon"><i class="icon-lock"></i></span>
-              <input type="password" class="form-control" formControlName="password" placeholder="Password">
+            <button type="submit" class="btn btn-block btn-success">Create Account</button>
+            </form>
+			</div>
+			<div *ngSwitchCase="'organisation'">
+			<form [formGroup]="signup.getForm()" (ngSubmit)="onSubmit()">
+			<div class="input-group mb-3">
+              <span class="input-group-addon"><i class="icon-user"></i></span>
+              <input type="text" class="form-control" formControlName="street_name" placeholder="Street Name">
             </div>
-
-            <div class="input-group mb-4">
-              <span class="input-group-addon"><i class="icon-lock"></i></span>
-              <input type="password" class="form-control" formControlName="confirmpassword" placeholder="Repeat password">
+			
+			<div class="input-group mb-3">
+              <span class="input-group-addon"><i class="icon-user"></i></span>
+              <input type="text" class="form-control" formControlName="name" placeholder="Organisation Name">
+            </div>
+			
+			<div class="input-group mb-3">
+              <span class="input-group-addon"><i class="icon-user"></i></span>
+              <input type="text" class="form-control" formControlName="town" placeholder="Town">
+            </div>
+			
+			<div class="input-group mb-3">
+              <span class="input-group-addon"><i class="icon-user"></i></span>
+              <input type="text" class="form-control" formControlName="postcode" placeholder="Postcode">
             </div>
 
             <button type="submit" class="btn btn-block btn-success">Create Account</button>
             </form>
+			</div>
+			<div heading="Pending" *ngSwitchDefault>Please Select a User Type</div>
+			</div>
 		  </div>
         </div>
       </div>