From 1d5b6f3c89ef6c3ea9c7304b52fa00fb680e0b5a Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Wed, 7 Apr 2021 20:27:15 +0100
Subject: [PATCH] Fixed #4103

---
 .../app/usermanagement/usermanagement.component.html   | 10 ++--------
 .../app/usermanagement/usermanagement.component.scss   |  2 ++
 .../src/app/usermanagement/usermanagement.component.ts |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.html b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.html
index 1dcbf29c0..492fe4f32 100644
--- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.html
+++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.html
@@ -105,14 +105,8 @@
           <ng-container matColumnDef="actions">
                 <th mat-header-cell *matHeaderCellDef> </th>
                 <td mat-cell *matCellDef="let u">
-                        <button id="edit{{u.userName}}" mat-raised-button color="accent" [routerLink]="['/usermanagement/user/' + u.id]">Details/Edit</button>
-                </td>
-          </ng-container>
-
-          <ng-container matColumnDef="welcome">
-                <th mat-header-cell *matHeaderCellDef> </th>
-                <td mat-cell *matCellDef="let u">
-                        <button *ngIf="!u.hasLoggedIn" mat-raised-button color="accent"  (click)="welcomeEmail(u)" [disabled]="!customizationSettings?.applicationUrl">Send Welcome Email</button>
+                        <button id="edit{{u.userName}}" mat-raised-button color="accent" [routerLink]="['/usermanagement/user/' + u.id]">Edit</button>  
+                        <button *ngIf="!u.hasLoggedIn" mat-raised-button color="accent"  (click)="welcomeEmail(u)" [disabled]="!customizationSettings?.applicationUrl"><i class="far fa-paper-plane"></i> Welcome</button>
                 </td>
           </ng-container>
 
diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.scss b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.scss
index e0404f197..df34508cf 100644
--- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.scss
+++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.scss
@@ -37,6 +37,8 @@
 
 .content {
     margin-top: 2em;
+    overflow-x: auto;
+
 }
 
 .buttons {
diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts
index 66268082b..c2245957c 100644
--- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts
+++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts
@@ -13,7 +13,7 @@ import { SelectionModel } from "@angular/cdk/collections";
 export class UserManagementComponent implements OnInit {
 
     public displayedColumns: string[] = ['select', 'username', 'alias', 'email', 'roles', 'remainingRequests',
-        'nextRequestDue', 'lastLoggedIn', 'userType', 'actions', 'welcome'];
+        'nextRequestDue', 'lastLoggedIn', 'userType', 'actions'];
     public dataSource: MatTableDataSource<IUser>;
 
     public selection = new SelectionModel<IUser>(true, []);