diff --git a/src/Ombi/ClientApp/src/app/interfaces/IUser.ts b/src/Ombi/ClientApp/src/app/interfaces/IUser.ts
index f3a07145b..4235d55cf 100644
--- a/src/Ombi/ClientApp/src/app/interfaces/IUser.ts
+++ b/src/Ombi/ClientApp/src/app/interfaces/IUser.ts
@@ -114,5 +114,6 @@ export enum INotificationAgent {
     Mattermost = 6,
     Mobile = 7,
     Gotify = 8,
-    WhatsApp = 9
+    Webhook = 9,
+    WhatsApp = 10
 }
diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.html b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.html
index 8bc212c43..d03bb9d2e 100644
--- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.html
+++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.html
@@ -1,175 +1,160 @@
-
-<div class="small-middle-container" *ngIf="!edit || edit && user">
-
-  <mat-horizontal-stepper #stepper>
-    <mat-step>
-      <ng-template matStepLabel>User Details</ng-template>
-      <div>
-        <mat-form-field>
-          <input matInput placeholder="Username" [(ngModel)]="user.userName" required>
-        </mat-form-field>
-      </div>
-      <div>
-        <mat-form-field>
-          <input matInput placeholder="Alias" [(ngModel)]="user.alias" matTooltip="This is used as a display value instead of the users username, so think of it as a more friendly username">
-        </mat-form-field>
-      </div>
-      <div>
-        <mat-form-field>
-          <input matInput placeholder="Email Address" type="email" [(ngModel)]="user.emailAddress" required>
-        </mat-form-field>
-      </div>
-      <div>
-        <mat-form-field>
-          <input matInput placeholder="Password" type="password" [(ngModel)]="user.password" required>
-        </mat-form-field>
-      </div>
-      <div>
-        <mat-form-field>
-          <input matInput placeholder="Confirm Password" type="password" [(ngModel)]="confirmPass" required>
-        </mat-form-field>
-      </div>
-      <div>
-        <button mat-button matStepperNext>Next</button>
-      </div>
-    </mat-step>
-
-
+<div class="small-middle-container" *ngIf="!edit || edit && user">
+  <div class="row">
+    <div class="col-md-3 col-sm-12">
+      <label class="control-label"><h3>User Details</h3></label>
+    <div>
+      <mat-form-field>
+        <input matInput placeholder="Username" [(ngModel)]="user.userName" required>
+      </mat-form-field>
+    </div>
+    <div>
+      <mat-form-field>
+        <input matInput placeholder="Alias" [(ngModel)]="user.alias"
+          matTooltip="This is used as a display value instead of the users username, so think of it as a more friendly username">
+      </mat-form-field>
+    </div>
+    <div>
+      <mat-form-field>
+        <input matInput placeholder="Email Address" type="email" [(ngModel)]="user.emailAddress">
+      </mat-form-field>
+    </div>
+    <div>
+      <mat-form-field>
+        <input matInput placeholder="Password" type="password" [(ngModel)]="user.password" required>
+      </mat-form-field>
+    </div>
+    <div>
+      <mat-form-field>
+        <input matInput placeholder="Confirm Password" type="password" [(ngModel)]="confirmPass" required>
+      </mat-form-field>
+    </div>
 
 
-    <mat-step>
-      <ng-template matStepLabel>Choose the Roles</ng-template>
-      <div *ngIf="!edit">
-        <div *ngFor="let c of availableClaims">
-          <mat-checkbox [(ngModel)]="c.enabled">{{c.value | humanize}}</mat-checkbox>
-        </div>
-      </div>
+  </div>
 
-      <div *ngIf="edit">
-        <div *ngFor="let c of user.claims">
-          <mat-checkbox [(ngModel)]="c.enabled">{{c.value | humanize}}</mat-checkbox>
-        </div>
-      </div>
-      <div>
-        <button mat-button matStepperPrevious>Back</button>
-        <button mat-button matStepperNext>Next</button>
-      </div>
-    </mat-step>
-    <mat-step>
-      <ng-template matStepLabel>Set Request Limits</ng-template>
-
-      <div>
-        <mat-form-field>
-          <input matInput placeholder="Movie Request Limit" [(ngModel)]="user.movieRequestLimit">
-        </mat-form-field>
-      </div>
-      <div>
-        <mat-form-field>
-          <input matInput placeholder="Episode Request Limit" [(ngModel)]="user.episodeRequestLimit">
-        </mat-form-field>
-      </div>
+  <div class="col-md-3 col-sm-12">
+    <label class="control-label"><h3>Request Limits</h3></label>
+    <div>
+      <mat-form-field>
+        <input matInput placeholder="Movie Request Limit" [(ngModel)]="user.movieRequestLimit">
+      </mat-form-field>
+    </div>
+    <div>
+      <mat-form-field>
+        <input matInput placeholder="Episode Request Limit" [(ngModel)]="user.episodeRequestLimit">
+      </mat-form-field>
+    </div>
+    <div>
+      <mat-form-field>
+        <input matInput placeholder="Music Request Limit" [(ngModel)]="user.musicRequestLimit">
+      </mat-form-field>
+    </div>
+    <label class="control-label"><h3>Quality & Root Path Preferences</h3></label>
+    <mat-form-field *ngIf="sonarrQualities">
+      <mat-label>Sonarr Quality Profile</mat-label>
+      <mat-select [(ngModel)]="user.userQualityProfiles.sonarrQualityProfile">
+        <mat-option *ngFor="let folder of sonarrQualities" [value]="folder.id">
+          {{folder.name}}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+
+    <mat-form-field *ngIf="sonarrQualities">
+      <mat-label>Sonarr Quality Profile (Anime)</mat-label>
+      <mat-select [(ngModel)]="user.userQualityProfiles.sonarrQualityProfileAnime">
+        <mat-option *ngFor="let folder of sonarrQualities" [value]="folder.id">
+          {{folder.name}}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+
+    <mat-form-field *ngIf="sonarrRootFolders">
+      <mat-label>Sonarr Root Folder</mat-label>
+      <mat-select [(ngModel)]="user.userQualityProfiles.sonarrRootPath">
+        <mat-option *ngFor="let folder of sonarrRootFolders" [value]="folder.id">
+          {{folder.path}}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+
+    <mat-form-field *ngIf="sonarrRootFolders">
+      <mat-label>Sonarr Root Folder (Anime)</mat-label>
+      <mat-select [(ngModel)]="user.userQualityProfiles.sonarrRootPathAnime">
+        <mat-option *ngFor="let folder of sonarrRootFolders" [value]="folder.id">
+          {{folder.path}}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+
+    <mat-form-field *ngIf="radarrQualities">
+      <mat-label>Radarr Quality Profiles</mat-label>
+      <mat-select [(ngModel)]="user.userQualityProfiles.radarrQualityProfile">
+        <mat-option *ngFor="let folder of radarrQualities" [value]="folder.id">
+          {{folder.name}}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+
+    <mat-form-field *ngIf="radarrRootFolders">
+      <mat-label>Radarr Root Folder</mat-label>
+      <mat-select [(ngModel)]="user.userQualityProfiles.radarrRootPath">
+        <mat-option *ngFor="let folder of radarrRootFolders" [value]="folder.id">
+          {{folder.path}}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+  </div>
+
+  <div class="col-md-2 col-sm-12">
+    <label class="control-label"><h3>Roles</h3></label>
+    <div *ngIf="!edit">
+      <div *ngFor="let c of availableClaims">
+        <mat-slide-toggle [(ngModel)]="c.enabled">{{c.value | humanize}}</mat-slide-toggle>
+      </div>
+    </div>
+
+    <div *ngIf="edit">
+      <div *ngFor="let c of user.claims">
+        <mat-slide-toggle [(ngModel)]="c.enabled">{{c.value | humanize}}</mat-slide-toggle>
+      </div>
+    </div>
+  </div>
+
+
+  <div class="col-md-3 col-sm-12">
+    <label class="control-label"><h3>Notification Preferences</h3></label>
+    <div *ngFor="let pref of notificationPreferences">
       <div>
         <mat-form-field>
-          <input matInput placeholder="Music Request Limit" [(ngModel)]="user.musicRequestLimit">
+          <input matInput placeholder="{{NotificationAgent[pref.agent] | humanize}}" [(ngModel)]="pref.value">
         </mat-form-field>
       </div>
+    </div>
+  </div>
 
-      <div>
-        <button mat-button matStepperPrevious>Back</button>
-        <button mat-button matStepperNext>Next</button>
-      </div>
-    </mat-step>
-    <mat-step>
-      <ng-template matStepLabel>Notification Preferences</ng-template>
-      <div *ngFor="let pref of notificationPreferences">
-        <div>
-          <mat-form-field>
-            <input matInput placeholder="{{NotificationAgent[pref.agent] | humanize}}" [(ngModel)]="pref.value">
-          </mat-form-field>
-        </div>
-      </div>
-      <div>
-        <button mat-button matStepperPrevious>Back</button>
-        <button mat-button matStepperNext>Next</button>
-      </div>
-    </mat-step>
+  </div>
 
-    <mat-step *ngIf="user.userQualityProfiles && (sonarrQualities || sonarrRootFolders || radarrQualities || radarrRootFolders)">
-      <ng-template matStepLabel>Quality & Root Path Preferences</ng-template>
 
+  <div class="row">
 
-      <mat-form-field *ngIf="sonarrQualities">
-        <mat-label>Sonarr Quality Profile</mat-label>
-        <mat-select [(ngModel)]="user.userQualityProfiles.sonarrQualityProfile">
-          <mat-option *ngFor="let folder of sonarrQualities" [value]="folder.id">
-            {{folder.name}}
-          </mat-option>
-        </mat-select>
-      </mat-form-field>
-
-      <mat-form-field *ngIf="sonarrQualities">
-        <mat-label>Sonarr Quality Profile (Anime)</mat-label>
-        <mat-select [(ngModel)]="user.userQualityProfiles.sonarrQualityProfileAnime">
-          <mat-option *ngFor="let folder of sonarrQualities" [value]="folder.id">
-            {{folder.name}}
-          </mat-option>
-        </mat-select>
-      </mat-form-field>
-
-      <mat-form-field *ngIf="sonarrRootFolders">
-        <mat-label>Sonarr Root Folder</mat-label>
-        <mat-select [(ngModel)]="user.userQualityProfiles.sonarrRootPath">
-          <mat-option *ngFor="let folder of sonarrRootFolders" [value]="folder.id">
-            {{folder.path}}
-          </mat-option>
-        </mat-select>
-      </mat-form-field>
-
-      <mat-form-field *ngIf="sonarrRootFolders">
-        <mat-label>Sonarr Root Folder (Anime)</mat-label>
-        <mat-select [(ngModel)]="user.userQualityProfiles.sonarrRootPathAnime">
-          <mat-option *ngFor="let folder of sonarrRootFolders" [value]="folder.id">
-            {{folder.path}}
-          </mat-option>
-        </mat-select>
-      </mat-form-field>
+<div class="col-md-3 col-sm-12">
+    <button *ngIf="!edit" type="button" mat-raised-button color="accent" data-test="createuserbtn"  (click)="create()">Create</button>
+    <div *ngIf="edit">
+      <button type="button" data-test="updatebtn" mat-raised-button color="accent" class="btn btn-primary-outline" (click)="update()">Update</button>
+      <button type="button" data-test="deletebtn" mat-raised-button color="warn" class="btn btn-danger-outline" (click)="delete()">Delete</button>
+      <button type="button" style="float:right;" mat-raised-button color="primary" class="btn btn-info-outline" (click)="resetPassword()" pTooltip="You need your SMTP settings setup">Send
+        Reset Password Link</button>
 
-      <mat-form-field *ngIf="radarrQualities">
-        <mat-label>Radarr Quality Profiles</mat-label>
-        <mat-select [(ngModel)]="user.userQualityProfiles.radarrQualityProfile">
-          <mat-option *ngFor="let folder of radarrQualities" [value]="folder.id">
-            {{folder.name}}
-          </mat-option>
-        </mat-select>
-      </mat-form-field>
+    </div>
 
-      <mat-form-field *ngIf="radarrRootFolders">
-        <mat-label>Radarr Root Folder</mat-label>
-        <mat-select [(ngModel)]="user.userQualityProfiles.radarrRootPath">
-          <mat-option *ngFor="let folder of radarrRootFolders" [value]="folder.id">
-            {{folder.path}}
-          </mat-option>
-        </mat-select>
-      </mat-form-field>
+</div>
+<div class="col-md-1 offset-md-8 col-sm-12">
+  <button type="button" mat-raised-button color="warn" (click)="back()">Back</button>
+</div>
+</div>
 
-      <div>
-        <button mat-button matStepperPrevious>Back</button>
-        <button mat-button matStepperNext>Next</button>
-      </div>
-    </mat-step>
-    <mat-step>
-      <ng-template matStepLabel>Actions</ng-template>
 
-      <button *ngIf="!edit" type="button" mat-raised-button color="accent" data-test="createuserbtn"  (click)="create()">Create</button>
-      <div *ngIf="edit">
-        <button type="button" data-test="updatebtn" mat-raised-button color="warn" class="btn btn-primary-outline" (click)="update()">Update</button>
-        <button type="button" data-test="deletebtn" mat-raised-button color="warn" class="btn btn-danger-outline" (click)="delete()">Delete</button>
-        <button type="button" style="float:right;" mat-raised-button color="primary" class="btn btn-info-outline" (click)="resetPassword()" pTooltip="You need your SMTP settings setup">Send
-          Reset Password Link</button>
 
-      </div>
-    </mat-step>
-  </mat-horizontal-stepper>
 
 
-</div>
+</div>
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.ts b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.ts
index e9ee08e4f..db0403a01 100644
--- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.ts
+++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.ts
@@ -1,8 +1,9 @@
-import { Component, OnInit } from "@angular/core";
+import { Location } from "@angular/common";
+import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 
 import { ICheckbox, INotificationAgent, INotificationPreferences, IRadarrProfile, IRadarrRootFolder, ISonarrProfile, ISonarrRootFolder, IUser, UserType } from "../interfaces";
-import { IdentityService, NotificationService, RadarrService, SonarrService, MessageService } from "../services";
+import { IdentityService, RadarrService, SonarrService, MessageService } from "../services";
 
 @Component({
     templateUrl: "./usermanagement-user.component.html",
@@ -15,7 +16,7 @@ export class UserManagementUserComponent implements OnInit {
     public availableClaims: ICheckbox[];
     public confirmPass: "";
     public notificationPreferences: INotificationPreferences[];
-    
+
     public sonarrQualities: ISonarrProfile[];
     public sonarrRootFolders: ISonarrRootFolder[];
     public radarrQualities: IRadarrProfile[];
@@ -29,7 +30,8 @@ export class UserManagementUserComponent implements OnInit {
                 private router: Router,
                 private route: ActivatedRoute,
                 private sonarrService: SonarrService,
-                private radarrService: RadarrService) {
+                private radarrService: RadarrService,
+                private location: Location) {
 
                     this.route.params.subscribe((params: any) => {
                         if(params.id) {
@@ -38,7 +40,7 @@ export class UserManagementUserComponent implements OnInit {
                             this.identityService.getUserById(this.userId).subscribe(x => {
                                 this.user = x;
                                });
-                        }   
+                        }
                     });
                  }
 
@@ -171,4 +173,8 @@ export class UserManagementUserComponent implements OnInit {
         });
     }
 
+    public back() {
+        this.location.back();
+    }
+
 }
diff --git a/src/Ombi/Controllers/V1/IdentityController.cs b/src/Ombi/Controllers/V1/IdentityController.cs
index 6afd7d70e..fa6e98d3a 100644
--- a/src/Ombi/Controllers/V1/IdentityController.cs
+++ b/src/Ombi/Controllers/V1/IdentityController.cs
@@ -933,7 +933,8 @@ namespace Ombi.Controllers.V1
         private readonly List<NotificationAgent> _excludedAgents = new List<NotificationAgent>
         {
             NotificationAgent.Email,
-            NotificationAgent.Mobile
+            NotificationAgent.Mobile,
+            NotificationAgent.Webhook
         };
         private async Task<List<UserNotificationPreferences>> GetPreferences(OmbiUser user)
         {