diff --git a/src/Ombi/ClientApp/src/app/login/login.component.html b/src/Ombi/ClientApp/src/app/login/login.component.html
index 8aa0faf94..0e1107008 100644
--- a/src/Ombi/ClientApp/src/app/login/login.component.html
+++ b/src/Ombi/ClientApp/src/app/login/login.component.html
@@ -27,7 +27,7 @@
 
                     <mat-checkbox formControlName="rememberMe">{{'Login.RememberMe' | translate}}</mat-checkbox>
 
-                    <button id="sign-in" mat-raised-button color="accent" type="submit">{{'Login.SignInButton' | translate}}</button>
+                    <button id="sign-in" mat-raised-button color="accent"  data-cy="OmbiButton"  type="submit">{{'Login.SignInButton' | translate}}</button>
 
                     <a [routerLink]="['/reset']" class="forgot-password col-md-12">
                         <b [translate]="'Login.ForgottenPassword'"></b>
diff --git a/src/Ombi/ClientApp/src/app/login/login.component.ts b/src/Ombi/ClientApp/src/app/login/login.component.ts
index 5a85783ae..5245b8239 100644
--- a/src/Ombi/ClientApp/src/app/login/login.component.ts
+++ b/src/Ombi/ClientApp/src/app/login/login.component.ts
@@ -73,7 +73,7 @@ export class LoginComponent implements OnDestroy, OnInit {
             });
 
         this.form = this.fb.group({
-            username: [""],
+            username: ["", Validators.required],
             password: [""],
             rememberMe: [false],
         });
@@ -112,7 +112,7 @@ export class LoginComponent implements OnDestroy, OnInit {
     public onSubmit(form: FormGroup) {
         if (form.invalid) {
             this.notify.open(this.errorValidation, "OK", {
-                duration: 3000
+                duration: 300000
             });
             return;
         }
@@ -139,7 +139,7 @@ export class LoginComponent implements OnDestroy, OnInit {
 
                 }, err => {
                 this.notify.open(this.errorBody, "OK", {
-                    duration: 3000
+                    duration: 3000000
                 })
             });
         });
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
index 2997cda3c..3e0cd1952 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
@@ -21,8 +21,8 @@
         </div>
         <hr>
         <div *ngIf="tv.status">
-            <span class="label">{{'MediaDetails.Status' | translate }}:</span>
-                {{tv.status}}
+            <span  class="label">{{'MediaDetails.Status' | translate }}:</span>
+                <span id="status">{{tv.status}}</span>
         </div>
         <span class="label">First Aired:</span>
             {{tv.firstAired | date: 'mediumDate'}}
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.html b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.html
index 91e4b2d8f..d6dbc9cab 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.html
@@ -67,7 +67,7 @@
  -->
 
 
-<button *ngIf="!tv.fullyAvailable && requestable" mat-fab color="accent" class="floating-fab" [matMenuTriggerFor]="aboveMenu">
+<button *ngIf="!tv.fullyAvailable && requestable" mat-fab color="accent" id="addFabBtn" class="floating-fab" [matMenuTriggerFor]="aboveMenu">
   <mat-icon>add</mat-icon></button>
 <mat-menu #aboveMenu="matMenu" yPosition="above">
 
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html b/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html
index 141c48b79..66dc83f3d 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html
@@ -46,24 +46,24 @@
                         <!--Next to poster-->
                         <div class="details-button-container">
                             <div class="col-12 media-row">
-                                <button *ngIf="!tv.fullyAvailable" mat-raised-button class="btn-spacing" color="primary"
+                                <button *ngIf="!tv.fullyAvailable" mat-raised-button id="requestBtn" class="btn-spacing" color="primary"
                                     (click)="request()"><i class="fas fa-plus"></i>
                                     {{ 'Common.Request' | translate }}</button>
 
-                                <button *ngIf="tv.fullyAvailable && !tv.partlyAvailable" mat-raised-button class="btn-spacing" color="accent"
+                                <button *ngIf="tv.fullyAvailable && !tv.partlyAvailable" id="availableBtn" mat-raised-button class="btn-spacing" color="accent"
                                     [disabled]>
                                     <i class="fas fa-check"></i> {{'Common.Available' | translate }}</button>
-                                    <button *ngIf="tv.partlyAvailable && !tv.fullyAvailable" mat-raised-button
+                                    <button *ngIf="tv.partlyAvailable && !tv.fullyAvailable" id="partiallyAvailableBtn" mat-raised-button
                                     class="btn-spacing" color="accent" [disabled]>
                                     <i class="fas fa-check"></i> {{'Common.PartiallyAvailable' | translate }}</button>
 
                                     <!-- There are unaired episodes-->
-                                    <button *ngIf="tv.partlyAvailable && tv.fullyAvailable" mat-raised-button
+                                    <button *ngIf="tv.partlyAvailable && tv.fullyAvailable" id="partiallyAvailableBtn" mat-raised-button
                                         class="btn-spacing" color="accent" [disabled]>
                                     <i class="fas fa-check"></i> {{'Common.PartiallyAvailable' | translate }}</button>
                                     <!-- end unaired episodes-->
 
-                                <button mat-raised-button class="btn-spacing" color="danger" *ngIf="issuesEnabled" (click)="issue()">
+                                <button mat-raised-button class="btn-spacing" color="danger" id="reportIssueBtn" *ngIf="issuesEnabled" (click)="issue()">
                                     <i class="fas fa-exclamation"></i> {{
                                     'Requests.ReportIssue' | translate }}</button>
 
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 64f5d76d2..74770a3d8 100644
--- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.html
+++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.html
@@ -4,18 +4,18 @@
       <label class="control-label"><h3>User Details</h3></label>
     <div>
       <mat-form-field>
-        <input matInput placeholder="Username" [(ngModel)]="user.userName" required>
+        <input matInput id="username" placeholder="Username" [(ngModel)]="user.userName" required>
       </mat-form-field>
     </div>
     <div>
       <mat-form-field>
-        <input matInput placeholder="Alias" [(ngModel)]="user.alias"
+        <input id="alias" 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">
+        <input id="emailAddress" matInput placeholder="Email Address" type="email" [(ngModel)]="user.emailAddress">
       </mat-form-field>
     </div>
     <mat-form-field>
@@ -28,12 +28,12 @@
     </mat-form-field>
     <div>
       <mat-form-field>
-        <input matInput placeholder="Password" type="password" [(ngModel)]="user.password" required>
+        <input id="password" 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>
+        <input id="confirmPass" matInput placeholder="Confirm Password" type="password" [(ngModel)]="confirmPass" required>
       </mat-form-field>
     </div>
 
@@ -44,17 +44,17 @@
     <label class="control-label"><h3>Request Limits</h3></label>
     <div>
       <mat-form-field>
-        <input matInput placeholder="Movie Request Limit" [(ngModel)]="user.movieRequestLimit">
+        <input id="movieRequestLimit" 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">
+        <input id="episodeRequestLimit" 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">
+        <input id="musicRequestLimit" matInput placeholder="Music Request Limit" [(ngModel)]="user.musicRequestLimit">
       </mat-form-field>
     </div>
     <label class="control-label"><h3>Quality & Root Path Preferences</h3></label>
@@ -117,13 +117,13 @@
     <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>
+        <mat-slide-toggle id="role{{c.value}}" [(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>
+        <mat-slide-toggle  id="role{{c.value}}" [(ngModel)]="c.enabled">{{c.value | humanize}}</mat-slide-toggle>
       </div>
     </div>
   </div>
@@ -134,7 +134,7 @@
     <div *ngFor="let pref of notificationPreferences">
       <div>
         <mat-form-field>
-          <input matInput placeholder="{{NotificationAgent[pref.agent] | humanize}}" [(ngModel)]="pref.value">
+          <input id="{{NotificationAgent[pref.agent]}}" matInput placeholder="{{NotificationAgent[pref.agent] | humanize}}" [(ngModel)]="pref.value">
         </mat-form-field>
       </div>
     </div>
diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.html b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.html
index b17b35dfd..1dcbf29c0 100644
--- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.html
+++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.html
@@ -73,10 +73,10 @@
           </ng-container>
           <ng-container matColumnDef="lastLoggedIn">
                 <th mat-header-cell *matHeaderCellDef mat-sort-header>  Last Logged In </th>
-                <td mat-cell *matCellDef="let u"> 
+                <td mat-cell *matCellDef="let u">
                         <span *ngIf="u.lastLoggedIn">
                                         {{u.lastLoggedIn  | amLocal | amDateFormat: 'l LT'}}
-                        </span>                
+                        </span>
                         <span *ngIf="!u.lastLoggedIn">
                                         Not logged in yet!
                         </span> </td>
@@ -92,10 +92,10 @@
                         <span *ngIf="u.userType === 5">Jellyfin User</span>
                 </td>
           </ng-container>
-  
+
           <ng-container matColumnDef="roles">
                 <th mat-header-cell *matHeaderCellDef> Roles </th>
-                <td mat-cell *matCellDef="let element"> 
+                <td mat-cell *matCellDef="let element">
                         <div *ngFor="let claim of element.claims">
                                 <span *ngIf="claim.enabled">{{claim.value}}</span>
                         </div>
@@ -105,7 +105,7 @@
           <ng-container matColumnDef="actions">
                 <th mat-header-cell *matHeaderCellDef> </th>
                 <td mat-cell *matCellDef="let u">
-                        <button mat-raised-button color="accent" [routerLink]="['/usermanagement/user/' + u.id]">Details/Edit</button>
+                        <button id="edit{{u.userName}}" mat-raised-button color="accent" [routerLink]="['/usermanagement/user/' + u.id]">Details/Edit</button>
                 </td>
           </ng-container>
 
@@ -115,7 +115,7 @@
                         <button *ngIf="!u.hasLoggedIn" mat-raised-button color="accent"  (click)="welcomeEmail(u)" [disabled]="!customizationSettings?.applicationUrl">Send Welcome Email</button>
                 </td>
           </ng-container>
-  
+
           <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
           <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
       </table>