diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html
index 8adfa23..9890d0b 100644
--- a/src/app/task-form/task-form.component.html
+++ b/src/app/task-form/task-form.component.html
@@ -5,12 +5,12 @@
                 <h4 class="modal-title">Neuen Task anlegen</h4>
             </tr>
             <tr>
-                <h6 class="modal-caption text-muted">
+                <h6 class="modal-caption text-muted" *ngIf="this.editing">
                     Gehört zu Story:
                     <a href="#" id="userstoryTitle">{{ this.userstoryId }}</a>
                 </h6>
             </tr>
-            <select class="form-control custom-select mr-sm-2" id="prio" required name="prio" [(ngModel)]="task.userstoryid">
+            <select *ngIf="!this.editing" class="form-control custom-select mr-sm-2" id="prio" required name="prio" [(ngModel)]="task.userstoryid">
                 <option *ngFor="let userstory of userstories" [ngValue]="userstory.id">{{ userstory.title }}</option>
             </select>
         </table>
diff --git a/src/app/task-form/task-form.component.ts b/src/app/task-form/task-form.component.ts
index c8860e7..8774b80 100644
--- a/src/app/task-form/task-form.component.ts
+++ b/src/app/task-form/task-form.component.ts
@@ -20,7 +20,8 @@ import { HttpResponse } from '@angular/common/http';
 })
 export class TaskFormComponent implements OnInit {
 	@Input() public task: ScrumTask;
-	public editing: Boolean;
+	public editing: boolean;
+	public creating: boolean;
 	public userstoryId: string;
 	public userstories: any[] = [];
 	public allStatus: any[] = [];
@@ -35,8 +36,11 @@ export class TaskFormComponent implements OnInit {
 		if (this.task === null || this.task === undefined) {
 			this.task = { title: '' };
 			this.editing = false;
-		} else {
+			this.creating = false;
+		} else if (this.task.userstoryid) {
 			this.editing = true;
+		} else {
+			this.creating = true;
 		}
 		document.getElementById('titleField').focus();
 		this.getRelatedStory();