Index: AAPClient/ProScan.dproj.local
===================================================================
diff -u -r105 -r107
--- AAPClient/ProScan.dproj.local	(.../ProScan.dproj.local)	(revision 105)
+++ AAPClient/ProScan.dproj.local	(.../ProScan.dproj.local)	(revision 107)
@@ -2,73 +2,76 @@
 <BorlandProject>
 	<Transactions>
     <Transaction>2019/03/01 14:25:16.000.954,=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas</Transaction>
-    <Transaction>2019/03/01 14:25:57.000.930,E:\svn\Delphi\AAPClient\ProScanMain.pas=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas</Transaction>
-    <Transaction>2019/03/01 14:25:57.000.930,E:\svn\Delphi\AAPClient\ProScanMain.dfm=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm</Transaction>
-    <Transaction>2019/03/01 14:26:05.000.981,E:\svn\Delphi\AAPClient\ProScan.dproj=C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj</Transaction>
+    <Transaction>2019/03/01 14:25:57.000.930,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas=E:\svn\Delphi\AAPClient\ProScanMain.pas</Transaction>
+    <Transaction>2019/03/01 14:25:57.000.930,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm=E:\svn\Delphi\AAPClient\ProScanMain.dfm</Transaction>
+    <Transaction>2019/03/01 14:26:05.000.981,C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj=E:\svn\Delphi\AAPClient\ProScan.dproj</Transaction>
     <Transaction>2019/03/01 14:28:35.000.977,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
+    <Transaction>2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.pas</Transaction>
+    <Transaction>2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.dfm</Transaction>
     <Transaction>2019/03/01 15:26:22.000.761,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas</Transaction>
-    <Transaction>2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm</Transaction>
+    <Transaction>2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
     <Transaction>2019/03/04 07:46:54.000.107,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/04 07:48:44.000.257,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/04 07:48:53.000.280,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=</Transaction>
-    <Transaction>2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
+    <Transaction>2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas</Transaction>
+    <Transaction>2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm</Transaction>
     <Transaction>2019/03/05 10:51:12.000.820,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/05 10:53:16.000.806,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
-    <Transaction>2019/03/05 10:56:57.000.976,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\GebruikerService.pas</Transaction>
+    <Transaction>2019/03/05 10:56:57.000.976,E:\svn\Delphi\AAPClient\WS\GebruikerService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/05 11:54:27.000.053,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
+    <Transaction>2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\PopupScherm.pas</Transaction>
+    <Transaction>2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm</Transaction>
     <Transaction>2019/03/06 07:41:24.000.503,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
-    <Transaction>2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\Images.dfm</Transaction>
+    <Transaction>2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\Images.pas</Transaction>
     <Transaction>2019/03/07 08:39:12.000.150,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
-    <Transaction>2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm</Transaction>
+    <Transaction>2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HomeScherm.pas</Transaction>
     <Transaction>2019/03/07 11:22:02.000.536,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
-    <Transaction>2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm</Transaction>
+    <Transaction>2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas</Transaction>
     <Transaction>2019/03/07 15:18:54.000.922,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
-    <Transaction>2019/03/07 15:19:13.000.507,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/03/07 15:19:13.000.507,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2019/03/08 10:21:18.000.208,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/08 10:26:55.000.996,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas</Transaction>
-    <Transaction>2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm</Transaction>
-    <Transaction>2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
-    <Transaction>2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm</Transaction>
-    <Transaction>2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm</Transaction>
+    <Transaction>2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas</Transaction>
+    <Transaction>2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm</Transaction>
+    <Transaction>2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2019/03/08 11:14:25.000.860,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
+    <Transaction>2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm</Transaction>
+    <Transaction>2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas</Transaction>
     <Transaction>2019/03/08 13:41:42.000.692,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/08 13:43:18.000.168,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
-    <Transaction>2019/03/08 13:43:18.000.167,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/08 13:43:18.000.167,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas</Transaction>
+    <Transaction>2019/03/08 13:43:18.000.168,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm</Transaction>
     <Transaction>2019/03/08 16:42:04.000.691,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/08 16:42:12.000.086,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/03/08 16:42:32.000.114,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/03/08 16:42:32.000.114,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2019/03/12 11:42:34.000.194,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
     <Transaction>2019/03/12 11:42:41.000.845,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
-    <Transaction>2019/03/12 11:42:52.000.715,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2019/03/12 11:42:52.000.715,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/18 09:44:48.000.103,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.dfm</Transaction>
-    <Transaction>2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas</Transaction>
+    <Transaction>2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\UI\InfoLogScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
     <Transaction>2019/03/18 11:06:46.000.842,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/18 11:07:10.000.880,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/03/18 11:07:23.000.750,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2019/03/18 11:07:23.000.750,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/19 14:36:29.000.587,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/19 14:42:58.000.764,E:\svn\Delphi\AAPClient\UI\UiContext.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/19 14:42:58.000.764,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\UiContext.pas</Transaction>
     <Transaction>2019/03/20 14:52:28.000.434,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/20 14:52:34.000.233,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/03/20 14:52:47.000.492,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/03/20 14:52:47.000.492,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2019/03/22 12:38:06.000.040,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
+    <Transaction>2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.pas</Transaction>
+    <Transaction>2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm</Transaction>
     <Transaction>2019/04/10 07:45:17.000.841,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/04/10 07:45:55.000.611,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/04/10 07:46:07.000.445,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2019/04/10 07:46:07.000.445,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/05/02 15:08:14.961,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/05/02 15:08:28.270,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
+    <Transaction>2019/05/02 15:08:38.127,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="UI"/>
Index: AAPClient/UI/LoginScherm.pas
===================================================================
diff -u -r101 -r107
--- AAPClient/UI/LoginScherm.pas	(.../LoginScherm.pas)	(revision 101)
+++ AAPClient/UI/LoginScherm.pas	(.../LoginScherm.pas)	(revision 107)
@@ -24,6 +24,7 @@
   private
     procedure SetStatusButtonRechtsOnderaan;
     procedure SetContext;
+    procedure HuidigeGebruikerAfmelden;
   public
   end;
 
@@ -38,14 +39,16 @@
 {$R *.dfm}
 
 procedure TfmLoginScherm.actAfsluitenExecute(Sender: TObject);
+begin
+  HuidigeGebruikerAfmelden;
+end;
+
+procedure TfmLoginScherm.HuidigeGebruikerAfmelden;
 var
   Service: GebruikerServiceSoap;
   Request: GebruikerAfmeldenRequest;
   Header: RequestHeader;
 begin
-  inherited;
-  SetContext;
-
   Service := GebruikerService.GetGebruikerServiceSoap();
 
   Request := GebruikerAfmeldenRequest.Create;
@@ -57,7 +60,6 @@
     Request.Header := Header;
 
     Service.GebruikerAfmelden(Request);
-    Self.ModalResult := mrAbort;
   finally
     Request.Free;
   end;
@@ -119,6 +121,7 @@
 
 procedure TfmLoginScherm.FormShow(Sender: TObject);
 begin
+  HuidigeGebruikerAfmelden;
   actRechtsOnder := actVolgende;
   actLinksOnder := actAfsluiten;
   btnRechtsOnder.Action := actRechtsOnder;