diff --git a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html
index 1dcf4824c..651634a0c 100644
--- a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html
+++ b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html
@@ -21,7 +21,7 @@
         </div>
         <div class="row button-request-container" *ngIf="!result.available && !result.approved && !result.requested">
             <div class="button-request poster-overlay">
-                <button id="requestButton{{result.id}}{{result.type}}{{discoverType}}" mat-raised-button class="btn-ombi full-width poster-request-btn" (click)="request($event)">
+                <button id="requestButton{{result.id}}{{result.type}}{{discoverType}}" *ngIf="requestable" mat-raised-button class="btn-ombi full-width poster-request-btn" (click)="request($event)">
                     <i *ngIf="!loading" class="fa-lg fas fa-cloud-download-alt"></i>
                     <i *ngIf="loading" class="fas fa-spinner fa-pulse fa-2x fa-fw" aria-hidden="true"></i>
                     {{'Common.Request' | translate }}
diff --git a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts
index c67ad1129..a257eafcb 100644
--- a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts
+++ b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts
@@ -24,6 +24,8 @@ export class DiscoverCardComponent implements OnInit {
     public fullyLoaded = false;
     public loading: boolean;
 
+    public requestable: boolean;
+
     // This data is needed to open the dialog
     private tvSearchResult: ISearchTvResultV2;
 
@@ -44,19 +46,10 @@ export class DiscoverCardComponent implements OnInit {
     }
 
     public async getExtraTvInfo() {
-        // if (this.result.tvMovieDb) {
-            this.tvSearchResult = await this.searchService.getTvInfoWithMovieDbId(+this.result.id);
-        // } else {
-        //     this.tvSearchResult = await this.searchService.getTvInfo(+this.result.id);
-        // }
-        // if (!this.tvSearchResult || this.tvSearchResult?.status.length > 0 && this.tvSearchResult?.status === "404") {
-        //     this.hide = true;
-        //     return;
-        // }
-
+        this.tvSearchResult = await this.searchService.getTvInfoWithMovieDbId(+this.result.id);
+        this.requestable = true;
         this.setTvDefaults(this.tvSearchResult);
         this.updateTvItem(this.tvSearchResult);
-
     }
 
     public async getAlbumInformation() {
@@ -69,12 +62,13 @@ export class DiscoverCardComponent implements OnInit {
                     if (art.image) {
                         this.result.posterPath = art.image;
 
-                        this.fullyLoaded = true;
                     }
                 })
             }
             this.result.title = x.startYear ? `${x.name} (${x.startYear})` : x.name;
             this.result.overview = x.overview;
+            this.fullyLoaded = true;
+            this.requestable = true;
         });
     }
 
@@ -166,6 +160,7 @@ export class DiscoverCardComponent implements OnInit {
         } else {
             this.fullyLoaded = true;
         }
+        this.requestable = true;
     }
 
     private updateMovieItem(updated: ISearchMovieResultV2) {
diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
index 190e253cf..c1b69b303 100644
--- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
+++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
@@ -78,8 +78,8 @@
             </div>
             <div class="profile-block">
                 <a routerLink="/user-preferences">
-                <div class="profile-username">{{username}}</div>
-                <div class="profile-img" data-test="profile-image"><img [matTooltip]="username" [src]="getUserImage()" /></div>
+                <div class="profile-username" data-test="profile-username">{{username}}</div>
+                <div class="profile-img" data-test="profile-image"><img [src]="getUserImage()" /></div>
             </a>
             </div>
 
diff --git a/tests/cypress/integration/page-objects/shared/NavBar.ts b/tests/cypress/integration/page-objects/shared/NavBar.ts
index 8ca5e70db..fb55aca92 100644
--- a/tests/cypress/integration/page-objects/shared/NavBar.ts
+++ b/tests/cypress/integration/page-objects/shared/NavBar.ts
@@ -72,6 +72,10 @@ class NavBar {
     return cy.getByData('profile-image');
   }
 
+  get username(): Cypress.Chainable<any> {
+    return cy.getByData('profile-username');
+  }
+
   get logout(): Cypress.Chainable<any> {
     return cy.get('#nav-logout');
   }
diff --git a/tests/cypress/tests/api/v1/tv-request.api.spec.ts b/tests/cypress/tests/api/v1/tv-request.api.spec.ts
new file mode 100644
index 000000000..526fc40dd
--- /dev/null
+++ b/tests/cypress/tests/api/v1/tv-request.api.spec.ts
@@ -0,0 +1,85 @@
+describe("TV Request V1 API tests", () => {
+  beforeEach(() => {
+    cy.login();
+  });
+
+  it("Request All of TV Show (Fear the Walking Dead)", () => {
+    const request = {
+      TvDbId: 290853,
+      RequestAll: true,
+    };
+
+    cy.api({
+      url: "/api/v1/request/tv",
+      body: JSON.stringify(request),
+      method: "POST",
+      headers: {
+        Authorization: "Bearer " + window.localStorage.getItem("id_token"),
+        "Content-Type": "application/json",
+      },
+    }).then((res) => {
+      expect(res.status).equal(200);
+      const body = res.body;
+      expect(body.result).to.be.true;
+      expect(body.requestId).not.to.be.null;
+      expect(body.isError).to.be.false;
+      expect(body.errorMessage).to.be.null;
+    });
+  });
+
+  it("Request First Season of TV Show (American Horror Story)", () => {
+    const request = {
+      TvDbId: 250487,
+      FirstSeason: true,
+    };
+
+    cy.api({
+      url: "/api/v1/request/tv",
+      body: JSON.stringify(request),
+      method: "POST",
+      headers: {
+        Authorization: "Bearer " + window.localStorage.getItem("id_token"),
+        "Content-Type": "application/json",
+      },
+    }).then((res) => {
+      expect(res.status).equal(200);
+      const body = res.body;
+      expect(body.result).to.be.true;
+      expect(body.requestId).not.to.be.null;
+      expect(body.isError).to.be.false;
+      expect(body.errorMessage).to.be.null;
+    });
+  });
+
+  it("Request Two Episode of First Season TV Show (The Sopranos)", () => {
+    const request = {
+      TvDbId: 75299,
+      Seasons: [
+        {
+          SeasonNumber: 1,
+          Episodes: [
+            { EpisodeNumber: 1 },
+            { EpisodeNumber: 2 },
+          ],
+        },
+      ],
+    };
+
+    cy.api({
+      url: "/api/v1/request/tv",
+      body: JSON.stringify(request),
+      method: "POST",
+      headers: {
+        Authorization: "Bearer " + window.localStorage.getItem("id_token"),
+        "Content-Type": "application/json",
+      },
+    }).then((res) => {
+      expect(res.status).equal(200);
+      const body = res.body;
+      expect(body.result).to.be.true;
+      expect(body.requestId).not.to.be.null;
+      expect(body.isError).to.be.false;
+      expect(body.errorMessage).to.be.null;
+    });
+  });
+});
diff --git a/tests/cypress/tests/navigation/navigation-bar.spec.ts b/tests/cypress/tests/navigation/navigation-bar.spec.ts
index 01e8d29e4..b633f6db4 100644
--- a/tests/cypress/tests/navigation/navigation-bar.spec.ts
+++ b/tests/cypress/tests/navigation/navigation-bar.spec.ts
@@ -11,6 +11,7 @@ describe("Navigation Bar Tests", () => {
     Page.navbar.requests.should("be.visible");
     Page.navbar.discover.should("be.visible");
     Page.navbar.userPreferences.should("be.visible");
+    Page.navbar.username.contains("a");
     Page.navbar.logout.should("be.visible");
   });
 
@@ -34,6 +35,7 @@ describe("Navigation Bar Tests", () => {
         Page.navbar.requests.should("be.visible");
         Page.navbar.discover.should("be.visible");
         Page.navbar.userPreferences.should("be.visible");
+        Page.navbar.username.contains(id);
         Page.navbar.logout.should("be.visible");
       });
     });