diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html
index ea5aca024..27d4a5787 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.html
+++ b/client/src/app/+admin/users/user-list/user-list.component.html
@@ -1,12 +1,3 @@
-<div class="admin-sub-header">
-  <h1 i18n class="form-sub-title">Users list</h1>
-
-  <a class="add-button" routerLink="/admin/users/create">
-    <my-global-icon iconName="add" aria-hidden="true"></my-global-icon>
-    <ng-container i18n>Create user</ng-container>
-  </a>
-</div>
-
 <p-table
   [value]="users" [lazy]="true" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [rowsPerPageOptions]="rowsPerPageOptions"
   [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id" [resizableColumns]="true"
@@ -14,7 +5,6 @@
   [showCurrentPageReport]="true" i18n-currentPageReportTemplate
   currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} users"
   (onPage)="onPage($event)" [expandedRowKeys]="expandedRows"
-  [rowStyleClass]="getRowClasses"
 >
   <ng-template pTemplate="caption">
     <div class="caption">
@@ -26,7 +16,7 @@
         </my-action-dropdown>
       </div>
 
-      <div class="has-feedback has-clear">
+      <div class="ml-auto has-feedback has-clear">
         <input
           type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..."
           (keyup)="onSearch($event)"
@@ -34,6 +24,10 @@
         <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a>
         <span class="sr-only" i18n>Clear filters</span>
       </div>
+      <a class="ml-2 add-button" routerLink="/admin/users/create">
+        <my-global-icon iconName="add" aria-hidden="true"></my-global-icon>
+        <ng-container i18n>Create user</ng-container>
+      </a>
     </div>
   </ng-template>
 
diff --git a/client/src/app/+admin/users/user-list/user-list.component.ts b/client/src/app/+admin/users/user-list/user-list.component.ts
index e167d1432..8f01c7d51 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.ts
+++ b/client/src/app/+admin/users/user-list/user-list.component.ts
@@ -87,12 +87,6 @@ export class UserListComponent extends RestTable implements OnInit {
     return 'UserListComponent'
   }
 
-  getRowClasses (rowData: User) {
-    return {
-      banned: rowData.blocked
-    }
-  }
-
   openBanUserModal (users: User[]) {
     for (const user of users) {
       if (user.username === 'root') {