diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java
index 1d445a5..8226f0d 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java
@@ -187,6 +187,8 @@ public class DiagnoseController {
     private void copyDiagnoseDataIntoFields(Diagnose diagnose){
         diagDiagnoseArzt.setValue(diagnose.getArzt());
 
+
+
         diagFreitext.setText(diagnose.getFreiText());
         diagDiagnoseArt.setValue(diagnose.getDiagArt());
         diagDiagnose.setValue(diagnose.getIcd10code());
@@ -202,10 +204,11 @@ public class DiagnoseController {
         diagnose.setArzt(diagDiagnoseArzt.getValue());
         diagnose.setFreiText(diagFreitext.getText());
         diagnose.setDiagArt(diagDiagnoseArt.getValue());
+        diagnose.setFall(mainController.getFall());
     }
 
     private void clearFields(){
-        diagDiagnoseArzt.setValue(null);
+        diagDiagnoseArzt.setValue(mainController.getCurrentMitarbeiter());
         diagDiagnose.setValue(null);
         diagFreitext.setText("");
         diagDiagnoseArt.setValue(null);