diff --git a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.ts b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.ts
index f751d1145d7f78579092dae1bd5829a987422ab7..cf9e7aa28abac2d4ae7be3d35084743377432cb8 100644
--- a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.ts
+++ b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.ts
@@ -4,7 +4,6 @@ import { CommandResource } from '@goofy-client/command-shared';
 import { StateResource } from '@goofy-client/tech-shared';
 import { VorgangForwardFormService } from './vorgang-forward.formservice';
 import { VorgangWithEingangResource } from '@goofy-client/vorgang-shared';
-import { isNil } from 'lodash-es';
 
 @Component({
 	selector: 'goofy-client-vorgang-forward-form',
@@ -22,13 +21,13 @@ export class VorgangForwardFormComponent implements OnChanges {
 
 	constructor(private formService: VorgangForwardFormService) { }
 
+	get form(): FormGroup {
+		return this.formService.form;
+	}
+
 	ngOnChanges(changes: SimpleChanges) {
-		if (changes.vorgang && !isNil(this.vorgang)) {
+		if (changes.vorgang && this.vorgang && this.vorgang.eingang && this.vorgang.eingang.zustaendigeStelle && this.vorgang.eingang.zustaendigeStelle.email) {
 			this.formService.patchField('email', this.vorgang.eingang.zustaendigeStelle.email)
 		}
 	}
-
-	get form(): FormGroup {
-		return this.formService.form;
-	}
 }