Index: AAPClient/UI/LoginScherm2.pas
===================================================================
diff -u -r227 -r240
--- AAPClient/UI/LoginScherm2.pas	(.../LoginScherm2.pas)	(revision 227)
+++ AAPClient/UI/LoginScherm2.pas	(.../LoginScherm2.pas)	(revision 240)
@@ -35,7 +35,7 @@
 implementation
 
 uses
-  GebruikerService, UiContext, Agent;
+  GebruikerService, UiContext, Agent, ProScanMain;
 
 {$R *.dfm}
 
@@ -57,6 +57,7 @@
   finally
     Response.Free;
   end;
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 procedure TfmLoginScherm2.edtInitialenKeyUp(Sender: TObject; var Key: Word;
@@ -95,8 +96,8 @@
 procedure TfmLoginScherm2.imgAfmeldenClick(Sender: TObject);
 begin
   inherited;
-  Self.ModalResult := mrAbort;
   HuidigeGebruikerAfmelden;
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrAbort);
 end;
 
 procedure TfmLoginScherm2.SetContext;