Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r89 -r90
--- AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 89)
+++ AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 90)
@@ -9,7 +9,6 @@
 type
   TfmProScanHoofdscherm = class(TForm)
     procedure FormCreate(Sender: TObject);
-    procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);
   private
     fUiContext: TUiContext;
@@ -35,14 +34,6 @@
 
 {$R *.dfm}
 
-procedure TfmProScanHoofdscherm.FormClose(Sender: TObject;
-  var Action: TCloseAction);
-begin
-  inherited;
-  HuidigeGebruikerAfmelden;
-  Application.Terminate;
-end;
-
 procedure TfmProScanHoofdscherm.FormCreate(Sender: TObject);
 begin
   fUiContext := TUiContext.Create();
@@ -55,8 +46,6 @@
   fInfoLogScherm := TfmInfoLogScherm.Create(Self);
 
   fHuidigScherm := fLoginScherm;
-
-  Self.Show;
 end;
 
 procedure TfmProScanHoofdscherm.FormShow(Sender: TObject);
@@ -81,7 +70,8 @@
     end;
   end;
 
-  Self.Close;
+  HuidigeGebruikerAfmelden;
+  Application.Terminate;
 end;
 
 procedure TfmProScanHoofdscherm.HuidigeGebruikerAfmelden;