diff --git a/static/src/app/users/user-list/user-item.component.html b/static/src/app/users/user-list/user-item.component.html
index 53fca86..9831890 100644
--- a/static/src/app/users/user-list/user-item.component.html
+++ b/static/src/app/users/user-list/user-item.component.html
@@ -1,9 +1,9 @@
-<div class="fade-in user-list-entry" [ngClass]="{selected : selected}">
+<div class="fade-in user-list-entry" [ngClass]="{selected : selected}" style="cursor: pointer;" (click)="select()">
 
   <div class="row">
     <div class="col-xs-9">
       <span>
-        <a (click)="select()">{{user.username}}</a>
+        <a>{{user.username}}</a>
       </span>
       <br>
       <small *ngIf="user.squad && user.squad.fraction == 'OPFOR'">CSAT - {{user.squad.name}}</small>
@@ -12,8 +12,8 @@
     </div>
 
     <div class="col-xs-3">
-      <span (click)="select()" title="Name, Squad, Rang" class="glyphicon glyphicon-pencil pull-left edit"></span>
-      <span (click)="award()" title="Auszeichnungen" class="icon-award pull-left"></span>
+      <span (click)="select(); $event.stopPropagation()" title="Name, Squad, Rang" class="glyphicon glyphicon-pencil pull-left edit"></span>
+      <span (click)="award(); $event.stopPropagation()" title="Auszeichnungen" class="icon-award pull-left"></span>
       <span (click)="delete(); $event.stopPropagation()" title="Löschen" class="glyphicon glyphicon-trash trash"></span>
     </div>
   </div>
diff --git a/static/src/app/users/user-list/user-list.component.html b/static/src/app/users/user-list/user-list.component.html
index 23e2902..347e042 100644
--- a/static/src/app/users/user-list/user-list.component.html
+++ b/static/src/app/users/user-list/user-list.component.html
@@ -44,7 +44,7 @@
                    [user]="user"
                    (userDelete)="deleteUser(user)"
                    (userSelected)="selectUser($event)"
-                   (userAward)="awardUser($event)"
+                   (userAward)="awardUser($event, $event)"
                    [selected]="user._id == selectedUserId">
     </pjm-user-item>
   </div>
diff --git a/static/src/app/users/user-list/user-list.component.ts b/static/src/app/users/user-list/user-list.component.ts
index 91de1c3..a40812a 100644
--- a/static/src/app/users/user-list/user-list.component.ts
+++ b/static/src/app/users/user-list/user-list.component.ts
@@ -57,7 +57,7 @@ export class UserListComponent implements OnInit {
     this.router.navigate([{outlets: {'right': ['overview', userId]}}], {relativeTo: this.route});
   }
 
-  awardUser(userId: string) {
+  awardUser(userId) {
     this.selectedUserId = userId;
     this.router.navigate([{outlets: {'right': ['award', userId]}}], {relativeTo: this.route});
   }