Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r66 -r67
--- AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 66)
+++ AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 67)
@@ -78,12 +78,11 @@
     if fHuidigScherm.ClassType = TfmLoginScherm then begin
       (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext;
       fModalResult := fHuidigScherm.ShowModal;
+      fUiContext := (fHuidigScherm as TfmDrieKnoppenScherm).UiContext;
       if fHuidigScherm.ModalResult = mrRetry then begin
         fModalResult := fHuidigScherm.ShowModal;
       end
       else if fHuidigScherm.ModalResult = mrOk then begin
-        fUiContext.Initialen := (fHuidigScherm as TfmLoginScherm).GeefInitialen();
-        fUiContext.LoginCode := (fHuidigScherm as TfmLoginScherm).GeefLoginCode();
         fHuidigScherm := fHomeScherm;
       end;
       continue;