diff --git a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts
index 1b237530e0a6ef0f6e602bdf2f31d0c10380b144..49941e525d4392644d90e722d437a3a4aaeeef12 100644
--- a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts
+++ b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts
@@ -10,7 +10,7 @@ import { TextEditorComponent } from 'libs/ui/src/lib/ui/text-editor/text-editor.
 import { MockComponent } from 'ng-mocks';
 import { VorgangForwardFormComponent } from './vorgang-forward-form.component';
 import { VorgangForwardFormService } from './vorgang-forward.formservice';
-import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
+import { createVorgang, createVorgangResource, createVorgangWithEingang, createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
 
 describe('VorgangForwardFormComponent', () => {
 	let component: VorgangForwardFormComponent;
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 7ef73f676a8c21c426cbf8bfb492217e24efe211..f751d1145d7f78579092dae1bd5829a987422ab7 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
@@ -1,16 +1,17 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 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',
 	templateUrl: './vorgang-forward-form.component.html',
 	styleUrls: ['./vorgang-forward-form.component.scss']
 })
-export class VorgangForwardFormComponent {
+export class VorgangForwardFormComponent implements OnChanges {
 
 	@Input() forwardStateResource: StateResource<CommandResource>;
 	@Input() vorgang: VorgangWithEingangResource;
@@ -19,8 +20,12 @@ export class VorgangForwardFormComponent {
 
 	readonly formServiceClass = VorgangForwardFormService;
 
-	constructor(private formService: VorgangForwardFormService) {
-		//this.formService.patchField('email', this.vorgang.eingang.zustaendigeStelle.email)
+	constructor(private formService: VorgangForwardFormService) { }
+
+	ngOnChanges(changes: SimpleChanges) {
+		if (changes.vorgang && !isNil(this.vorgang)) {
+			this.formService.patchField('email', this.vorgang.eingang.zustaendigeStelle.email)
+		}
 	}
 
 	get form(): FormGroup {