Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r65 -r66
--- AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 65)
+++ AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 66)
@@ -51,7 +51,7 @@
 procedure TfmProScanHoofdscherm.FormCreate(Sender: TObject);
 begin
   fUiContext := TUiContext.Create();
-  fImagesScherm := TImagesScherm.Create(Self);
+  //fImagesScherm := TImagesScherm.Create(Self);
   fLoginScherm := TfmLoginScherm.Create(Self);
   fHomeScherm := TfmHomeScherm.Create(Self);
   fPalletScherm := TfmPalletScherm.Create(Self);
@@ -72,25 +72,26 @@
 
 
   while fModalResult <> mrAbort do begin
-    //(fHuidigScherm as TfmDrieKnoppenScherm).lblGebruiker.Caption := fUiContext.Initialen;
     (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext;
     //LoginScherm tonen
+
     if fHuidigScherm.ClassType = TfmLoginScherm then begin
+      (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext;
       fModalResult := fHuidigScherm.ShowModal;
       if fHuidigScherm.ModalResult = mrRetry then begin
         fModalResult := fHuidigScherm.ShowModal;
       end
       else if fHuidigScherm.ModalResult = mrOk then begin
         fUiContext.Initialen := (fHuidigScherm as TfmLoginScherm).GeefInitialen();
-        fInitialen := (fHuidigScherm as TfmLoginScherm).GeefInitialen();
-        fLoginCode := (fHuidigScherm as TfmLoginScherm).GeefLoginCode();
+        fUiContext.LoginCode := (fHuidigScherm as TfmLoginScherm).GeefLoginCode();
         fHuidigScherm := fHomeScherm;
       end;
       continue;
     end;
 
     //HomeScherm tonen
     if fHuidigScherm.ClassType = TfmHomeScherm then begin
+      (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext;
       fModalResult := fHuidigScherm.ShowModal;
       if fHuidigScherm.ModalResult = mrYes then begin
         fHuidigScherm := fPalletScherm;
@@ -107,6 +108,7 @@
 
     //PalletScherm tonen
     if fHuidigScherm.ClassType = TfmPalletScherm then begin
+      (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext;
       fModalResult := fHuidigScherm.ShowModal;
       if fHuidigScherm.ModalResult = mrYes then begin
         fHuidigScherm := fHomeScherm;
@@ -130,6 +132,7 @@
 
     //BestaandePalletScherm tonen
     if fHuidigScherm.ClassType = TfmBestaandePalletScherm then begin
+      (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext;
       (fHuidigScherm as TfmBestaandePalletScherm).lblPalletCode.Caption := fHuidigePallet;
       fModalResult := fHuidigScherm.ShowModal;
       if fHuidigScherm.ModalResult = mrYes then begin
@@ -149,6 +152,7 @@
 
     //DnaCodeScherm tonen
     if fHuidigScherm.ClassType = TfmDnaCodeScherm then begin
+      (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext;
       (fHuidigScherm as TfmDnaCodeScherm).lblPalletCode.Caption := fHuidigePallet;
       fModalResult := fHuidigScherm.ShowModal;
       fHuidigeToelevering := (fHuidigScherm as TfmDnaCodeScherm).GeefToelevering();
@@ -169,6 +173,7 @@
 
     //InfoLogScherm tonen
     if fHuidigScherm.ClassType = TfmInfoLogScherm then begin
+      (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext;
       (fHuidigScherm as TfmInfoLogScherm).lblToelevering.Caption := fHuidigeToelevering;
       fModalResult := fHuidigScherm.ShowModal;
       if fHuidigScherm.ModalResult = mrYes then begin
@@ -203,7 +208,7 @@
   Header := RequestHeader.Create;
   try
     Request.Initialen := fUiContext.Initialen;
-    Request.LoginCode := fLoginCode;
+    Request.LoginCode := fUiContext.LoginCode;
     Header.Initialen := fUiContext.Initialen;
     Request.Header := Header;
 
Index: AAPClient/UI/DrieKnoppenScherm.dfm
===================================================================
diff -u -r65 -r66
--- AAPClient/UI/DrieKnoppenScherm.dfm	(.../DrieKnoppenScherm.dfm)	(revision 65)
+++ AAPClient/UI/DrieKnoppenScherm.dfm	(.../DrieKnoppenScherm.dfm)	(revision 66)
@@ -11,6 +11,7 @@
   Font.Name = 'Tahoma'
   Font.Style = []
   OldCreateOrder = False
+  OnCreate = FormCreate
   OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 19
Index: AAPClient/Win32/Debug/DrieKnoppenScherm.dcu
===================================================================
diff -u -r65 -r66
Binary files differ
Index: AAPClient/Win32/Debug/ProScanMain.dcu
===================================================================
diff -u -r65 -r66
Binary files differ
Index: AAPClient/UI/UiContext.pas
===================================================================
diff -u -r64 -r66
--- AAPClient/UI/UiContext.pas	(.../UiContext.pas)	(revision 64)
+++ AAPClient/UI/UiContext.pas	(.../UiContext.pas)	(revision 66)
@@ -6,8 +6,10 @@
   TUiContext = class
   private
     fInitialen: String;
+    fLoginCode: String;
   public
     Property Initialen: String Read fInitialen Write fInitialen;
+    Property LoginCode: String Read fLoginCode Write fLoginCode;
   end;
 
 implementation
Index: AAPClient/Win32/Debug/ProScan.exe
===================================================================
diff -u -r65 -r66
Binary files differ
Index: AAPClient/Win32/Debug/LoginScherm.dcu
===================================================================
diff -u -r65 -r66
Binary files differ