diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html
index 2e688ac..872a86a 100644
--- a/src/app/task-form/task-form.component.html
+++ b/src/app/task-form/task-form.component.html
@@ -1,83 +1,118 @@
-<div class="card" style="width: 100%;">    
+<div class="card" style="width: 100%;">
     <div class="container">
-    <div class="card-body">
-        <div style="text-align: right;">
-            <i class="fa fa-times fa-2x" (click)="onClose()"></i>
-    </div>
-        <div class="row">
-        <div class="col-8" style="text-align: left;">
-                <h4 class="card-title">Neuen Task anlegen</h4>
-                <div ngbDropdown class="dropdown card-text">
-                    <span ngbDropdownToggle class="dropdown" id="dropdownMenuUserstory" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                        Gehört zu Story: {{getUserstoryTitleById(task.userstoryid) || "Keine"}}
-                        <i class="fa fa-caret-down"></i>
-                    </span>
-                    <div ngbDropdownMenu class="dropdown-menu" aria-labelledby="dropdownMenuUserstory">
-                        <option ngbDropdownItem *ngFor="let userstory of userstories" (click)="task.userstoryid = userstory.id">{{ userstory.title }}</option>
+        <div class="card-body">
+            <div style="text-align: right;">
+                <i class="fa fa-times fa-2x" (click)="onClose()"></i>
+            </div>
+            <div class="row">
+                <div class="col-8" style="text-align: left;">
+                    <h4 class="card-title">Neuen Task anlegen</h4>
+                    <div ngbDropdown class="dropdown card-text">
+                        <span ngbDropdownToggle class="dropdown" id="dropdownMenuUserstory" data-toggle="dropdown"
+                            aria-haspopup="true" aria-expanded="false">
+                            Gehört zu Story: {{getUserstoryTitleById(task.userstoryid) || "Keine"}}
+                            <i class="fa fa-caret-down"></i>
+                        </span>
+                        <div ngbDropdownMenu class="dropdown-menu" aria-labelledby="dropdownMenuUserstory">
+                            <option ngbDropdownItem *ngFor="let userstory of userstories"
+                                (click)="task.userstoryid = userstory.id">{{ userstory.title }}</option>
+                        </div>
                     </div>
                 </div>
-    </div>
-    <div class="col-4"></div>
-        </div>
-        <form (ngSubmit)="onSubmit()">
-            <div class="row">
-            <div class="col-8">
-                    <div class="form-group">
-                        <label for="Title">Titel</label>
-                        <input type="text" class="form-control" id="Title" required name="title" [(ngModel)]="task.title" id="titleField"/>
-                    </div>
-                    <div class="form-group">
-                        <label for="Inhalt">What to do?</label>
-                        <textarea type="text" class="form-control" id="Story" required name="story" rows="5" [(ngModel)]="task.content"></textarea>
-                    </div>                
+                <div class="col-4"></div>
             </div>
-            <div class="col-4">
+            <form (ngSubmit)="onSubmit()">
+                <div class="row">
+                    <div class="col-8">
+                        <div class="form-group">
+                            <label for="Title">Titel</label>
+                            <input type="text" class="form-control" id="Title" required name="title"
+                                [(ngModel)]="task.title" id="titleField" />
+                        </div>
+                        <div class="form-group">
+                            <label for="Inhalt">What to do?</label>
+                            <textarea type="text" class="form-control" id="Story" required name="story" rows="5"
+                                [(ngModel)]="task.content"></textarea>
+                        </div>
+                    </div>
+                    <div class="col-4">
                         <div ngbDropdown class="dropdown">
-                            <button ngbDropdownToggle class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            <button ngbDropdownToggle class="btn btn-secondary dropdown-toggle" type="button"
+                                id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                 Prio: {{task.priority}}
                             </button>
                             <div ngbDropdownMenu class="dropdown-menu" aria-labelledby="dropdownMenu2">
-                                <option ngbDropdownItem *ngFor="let p of getAllPriorities()" (click)="task.priority=p">{{p}}</option>
+                                <option ngbDropdownItem *ngFor="let p of getAllPriorities()" (click)="task.priority=p">
+                                    {{p}}</option>
                             </div>
-                    </div>
-                    <div class="form-group">
-                        <div ngbDropdown class="dropdown" [autoClose]="false">
-                            <button ngbDropdownToggle class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                              Status: {{getStatusTitleById(task.statusid)}}
-                            </button>
-                            <div ngbDropdownMenu class="dropdown-menu" aria-labelledby="dropdownMenu2">
-                                <div class="card-text" for="Inhalt">Status wählen</div>
-                                <option disable-auto-close ngbDropdownItem *ngFor="let status of allStatus" (click)="task.statusid = status.id">{{ status.title }}</option>
-                            
-                            <div class="dropdown-divider"></div>
-                            <div class="card-text" for="Inhalt">Neuer Status</div>
-                            <input #statusname type="text" id="statusname" class="dropdown-item" (change)="status.title=statusname.value" placeholder="New Title..." style="background-color: rgba(211, 211, 211, 0.342);">
-                            <button disable-auto-close ngbDropdownItem class="dropdown-item" type="button"  (click)="createTaskStatus(status)">Status anlegen</button>
-                            <button disable-auto-close ngbDropdownItem class="dropdown-item" type="button" (click)="deleteStatus(task.statusid)">Status löschen</button>
+                        </div>
+                        <!-- Section to choose, create or delete a random status for the userstory. -->
+                        <div class="form-group">
+                            <div ngbDropdown class="dropdown" [autoClose]="false">
+                                <button ngbDropdownToggle class="btn btn-secondary dropdown-toggle" type="button"
+                                    id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true"
+                                    aria-expanded="false">
+                                    Status: {{getStatusTitleById(task.statusid)}}
+                                </button>
+                                <div ngbDropdownMenu class="dropdown-menu" aria-labelledby="dropdownMenu2">
+                                    <div class="card-text" for="Inhalt">Status wählen</div>
+                                    <option disable-auto-close ngbDropdownItem *ngFor="let status of allStatus"
+                                        (click)="task.statusid = status.id">{{ status.title }}</option>
+
+                                    <div class="dropdown-divider"></div>
+                                    <div class="card-text" for="Inhalt">Neuer Status</div>
+                                    <input #statusname type="text" id="statusname" class="dropdown-item"
+                                        (change)="status.title=statusname.value" placeholder="New Title..."
+                                        style="background-color: rgba(211, 211, 211, 0.342);">
+                                    <button disable-auto-close ngbDropdownItem class="dropdown-item" type="button"
+                                        (click)="createTaskStatus(status)">Status anlegen</button>
+                                    <button disable-auto-close ngbDropdownItem class="dropdown-item" type="button"
+                                        (click)="deleteStatus(task.statusid)">Status löschen</button>
+                                </div>
                             </div>
-                          </div>
-                        <div class="dropdown-menu">
-                        <select class="form-control custom-select mr-sm-2" id="prio" required name="prio" [(ngModel)]="task.statusid">
-                            <option *ngFor="let status of allStatus" [value]="status.id">{{
+                            <div class="dropdown-menu">
+                                <select class="form-control custom-select mr-sm-2" id="prio" required name="prio"
+                                    [(ngModel)]="task.statusid">
+                                    <option *ngFor="let status of allStatus" [value]="status.id">{{
                 status.title
               }}</option>
-                        </select>
+                                </select>
+                            </div>
+                        </div>
+                        <!-- Section to choose an author for the userstory. -->
+                        <div class="form-group">
+                            <div ngbDropdown class="dropdown" [autoClose]="true">
+                                <button ngbDropdownToggle class="btn btn-secondary dropdown-toggle" type="button"
+                                    id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true"
+                                    aria-expanded="false">
+                                    Bearbeiter: {{getAuthorById(task.assignedtoid)}}
+                                </button>
+                                <div ngbDropdownMenu class="dropdown-menu" aria-labelledby="dropdownMenu2">
+                                    <div class="card-text" for="Inhalt">User wählen</div>
+                                    <option disable-auto-close ngbDropdownItem *ngFor="let user of allUser"
+                                        (click)="task.assignedtoid = user.id">{{ user.name }}</option>
+                                </div>
+                            </div>
+                            <div class="dropdown-menu">
+                                <select class="form-control custom-select mr-sm-2" id="prio" required name="prio"
+                                    [(ngModel)]="task.assignedtoid">
+                                    <option *ngFor="let user of allUser" [value]="user.id">{{
+                user.name
+              }}</option>
+                                </select>
+                            </div>
+                        </div>
                     </div>
                 </div>
-                <div class="form-group">
-                    <label for="Inhalt">Assigned User</label>
-                    <input type="text" class="form-control" id="Author" required name="author"/>
+                <div class="row">
+                    <div class="col-6">
+                        <button (click)="onClose()" type="dismiss" class="btn btn-secondary" data-dismiss="modal">
+                            Abbrechen
+                        </button>
+                        <button type="submit" class="btn btn-primary">Erstellen</button>
+                    </div>
                 </div>
-                </div>
-    </div>
-    <div class="row">
-        <div class="col-6">
-            <button (click)="onClose()" type="dismiss" class="btn btn-secondary" data-dismiss="modal">
-                Abbrechen
-            </button>
-            <button type="submit" class="btn btn-primary">Erstellen</button>
+            </form>
         </div>
     </div>
-</form></div>
-</div>
 </div>
\ No newline at end of file
diff --git a/src/app/task-form/task-form.component.ts b/src/app/task-form/task-form.component.ts
index 2b361ca..d4df3c8 100644
--- a/src/app/task-form/task-form.component.ts
+++ b/src/app/task-form/task-form.component.ts
@@ -26,10 +26,13 @@ export class TaskFormComponent implements OnInit {
 	public userstories: any[] = [];
 	public allStatus: any[] = [];
 	public status: ScrumStatus = {title: "", description: ""};
+	public allUser: any[] = [];
+	public user: ScrumUser = { name: "" };
 
 	constructor(private backendService: BackendService, private activeModalService: NgbActiveModal) {
 		this.getUserStories();
 		this.getTaskStatus();
+		this.getAllUsers();
 	}
 
 	ngOnInit(): void {
@@ -155,4 +158,27 @@ export class TaskFormComponent implements OnInit {
 		  }
 		return status.title;
 	}
+
+	// Methods for choosing creator of a userstory.
+
+	getAllUsers() {
+		this.backendService.getUsers().subscribe((response) => {
+			if (response.status > 399) {
+				alert('Fehler');
+			} else {
+				this.allUser.push(...response.body);
+			}
+		});
+	}
+
+	getAuthorById(id: number): string {
+		if (!id) {
+			return null;
+		}
+		var user = this.allUser.find((x) => x.id === id);
+		if (!user) {
+			return null;
+		}
+		return user.name;
+	}
 }