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;
Index: AAPClient/UI/LoginScherm.pas
===================================================================
diff -u -r44 -r67
--- AAPClient/UI/LoginScherm.pas	(.../LoginScherm.pas)	(revision 44)
+++ AAPClient/UI/LoginScherm.pas	(.../LoginScherm.pas)	(revision 67)
@@ -23,9 +23,8 @@
     procedure actVolgendeExecute(Sender: TObject);
   private
     procedure SetStatusButtonRechtsOnderaan;
+    procedure SetContext;
   public
-    function GeefInitialen: string;
-    function GeefLoginCode: string;
   end;
 
 var
@@ -45,14 +44,16 @@
   Header: RequestHeader;
 begin
   inherited;
+  SetContext;
+
   Service := GebruikerService.GetGebruikerServiceSoap();
 
   Request := GebruikerAfmeldenRequest.Create;
   Header := RequestHeader.Create;
   try
-    Request.Initialen := edtInitialen.Text;
-    Request.LoginCode := edtPincode.Text;
-    Header.Initialen := edtInitialen.Text;
+    Request.Initialen := UiContext.Initialen;
+    Request.LoginCode := UiContext.LoginCode;
+    Header.Initialen := UiContext.Initialen;
     Request.Header := Header;
 
     Service.GebruikerAfmelden(Request);
@@ -69,14 +70,16 @@
   Response: GebruikerAanmeldenResponse;
   Header: RequestHeader;
 begin
+  SetContext;
+
   Service := GebruikerService.GetGebruikerServiceSoap();
   // request opbouwen
   Request := GebruikerAanmeldenRequest.Create;
   Header := RequestHeader.Create;
   try
-    Request.Initialen := edtInitialen.Text;
-    Request.LoginCode := edtPincode.Text;
-    Header.Initialen := edtInitialen.Text;
+    Request.Initialen := UiContext.Initialen;
+    Request.LoginCode := UiContext.LoginCode;
+    Header.Initialen := UiContext.Initialen;
     Header.ComputerNaam := ComputerName();
     Request.Header := Header;
 
@@ -86,7 +89,7 @@
         Self.ModalResult := mrRetry;
         ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw')
       end else begin
-        lblGebruiker.Caption := edtInitialen.Text;
+        lblGebruiker.Caption := UiContext.Initialen;
         lblGebruiker.Visible := true;
         Self.ModalResult := mrOk;
       end;
@@ -102,13 +105,15 @@
   Shift: TShiftState);
 begin
   inherited;
+  SetContext;
   SetStatusButtonRechtsOnderaan;
 end;
 
 procedure TfmLoginScherm.edtPincodeKeyUp(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
   inherited;
+  SetContext;
   SetStatusButtonRechtsOnderaan;
 end;
 
@@ -122,16 +127,12 @@
   inherited;
 end;
 
-function TfmLoginScherm.GeefInitialen: string;
+procedure TfmLoginScherm.SetContext;
 begin
-  result := edtInitialen.Text;
+  UiContext.Initialen := edtInitialen.Text;
+  UiContext.LoginCode := edtPinCode.Text;
 end;
 
-function TfmLoginScherm.GeefLoginCode: string;
-begin
-  result := edtPinCode.Text;
-end;
-
 procedure TfmLoginScherm.SetStatusButtonRechtsOnderaan;
 begin
   btnRechtsOnder.Enabled := ((edtPincode.Text <> '') and (edtInitialen.Text <> ''));
Index: AAPClient/Win32/Debug/ProScan.exe
===================================================================
diff -u -r66 -r67
Binary files differ
Index: AAPClient/Win32/Debug/ProScanMain.dcu
===================================================================
diff -u -r66 -r67
Binary files differ
Index: AAPClient/Win32/Debug/LoginScherm.dcu
===================================================================
diff -u -r66 -r67
Binary files differ