Index: AAPClient/ProScanMain.dfm
===================================================================
diff -u -r48 -r90
--- AAPClient/ProScanMain.dfm	(.../ProScanMain.dfm)	(revision 48)
+++ AAPClient/ProScanMain.dfm	(.../ProScanMain.dfm)	(revision 90)
@@ -13,7 +13,6 @@
   Font.Style = []
   OldCreateOrder = False
   Visible = True
-  OnClose = FormClose
   OnCreate = FormCreate
   OnShow = FormShow
   PixelsPerInch = 96
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;
Index: AAPClient/ProScan.dpr
===================================================================
diff -u -r81 -r90
--- AAPClient/ProScan.dpr	(.../ProScan.dpr)	(revision 81)
+++ AAPClient/ProScan.dpr	(.../ProScan.dpr)	(revision 90)
@@ -22,14 +22,5 @@
   Application.Initialize;
   Application.MainFormOnTaskbar := True;
   Application.CreateForm(TfmProScanHoofdscherm, fmProScanHoofdscherm);
-  Application.CreateForm(TfmDrieKnoppenScherm, fmDrieKnoppenScherm);
-  Application.CreateForm(TfmLoginScherm, fmLoginScherm);
-  Application.CreateForm(TfmPopupScherm, fmPopupScherm);
-  Application.CreateForm(TImagesScherm, ImagesScherm);
-  Application.CreateForm(TfmHomeScherm, fmHomeScherm);
-  Application.CreateForm(TfmPalletScherm, fmPalletScherm);
-  Application.CreateForm(TfmBestaandePalletScherm, fmBestaandePalletScherm);
-  Application.CreateForm(TfmDnaCodeScherm, fmDnaCodeScherm);
-  Application.CreateForm(TfmInfoLogScherm, fmInfoLogScherm);
   Application.Run;
 end.