diff --git a/src/frontend/app/administration/user/user-administration.component.html b/src/frontend/app/administration/user/user-administration.component.html
index 680bbd3e54ad06924dc4f138e9fb12adbe2e9f59..ddfc8e32f6f7ef68458b5338481f55e616aeb23f 100755
--- a/src/frontend/app/administration/user/user-administration.component.html
+++ b/src/frontend/app/administration/user/user-administration.component.html
@@ -4,7 +4,7 @@
             [opened]="mobileQuery.matches ? false : true">
             <menu-shortcut></menu-shortcut>
             <menu-nav></menu-nav>
-            <mat-nav-list style="width:250px;" *ngIf="!creationMode && !loading">
+            <mat-nav-list *ngIf="!creationMode && !loading">
                 <h3 mat-subheader>{{lang.actions}}</h3>
                 <a mat-list-item *ngIf="user.status != 'ABS'" (click)="activateAbsence()">
                     <mat-icon color="warn" mat-list-icon class="fa fa-plane"></mat-icon>
diff --git a/src/frontend/app/administration/user/user-administration.component.ts b/src/frontend/app/administration/user/user-administration.component.ts
index c8a40c7fbeda9b83331cf805a56507f4311aae34..c7893c8de666000583c3a0d999603c4e622cfa08 100755
--- a/src/frontend/app/administration/user/user-administration.component.ts
+++ b/src/frontend/app/administration/user/user-administration.component.ts
@@ -78,6 +78,7 @@ export class UserAdministrationComponent extends AutoCompletePlugin implements O
 
     displayedColumns    = ['event_date', 'event_type', 'info', 'remote_ip'];
     dataSource          = new MatTableDataSource(this.data);
+    selectedTabIndex : number = 0;
 
     @ViewChild(MatPaginator) paginator: MatPaginator;
     @ViewChild(MatSort) sort: MatSort;
@@ -706,6 +707,7 @@ export class UserAdministrationComponent extends AutoCompletePlugin implements O
         this.firstFormGroup.controls['newPasswordCtrl'].setErrors(null);
         this.firstFormGroup.controls['retypePasswordCtrl'].setErrors(null);
         this.showPassword = true;
+        this.selectedTabIndex = 0;
     }
 
     updatePassword() {