Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r10 -r11
--- AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 10)
+++ AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 11)
@@ -13,6 +13,7 @@
   private
     fInitialen: string;
     fLoginCode: string;
+    fHuidigScherm: TForm;
   public
   end;
 
@@ -38,30 +39,40 @@
 
   Request := GebruikerAfmeldenRequest.Create;
   Header := RequestHeader.Create;
-    ShowMessage('afgemeld');
   try
     Request.Initialen := fInitialen;
     Request.LoginCode := fLoginCode;
     Header.Initialen := fInitialen;
     Request.Header := Header;
 
     Service.GebruikerAfmelden(Request);
+    ShowMessage(fInitialen+'afgemeld');
   finally
     Request.Free;
   end;
+  Application.Terminate;
 end;
 
 procedure TfmProScanHoofdscherm.FormCreate(Sender: TObject);
 var
   LoginScherm: TfmLoginScherm;
+  fModalResult: TModalResult;
 begin
-  LoginScherm := TfmLoginScherm.Create(Self);
-  If LoginScherm.ShowModal = mrNone then begin
-    fInitialen := LoginScherm.GeefInitialen;
-    fLoginCode := LoginScherm.GeefLoginCode;
-  end else begin
-    self.Close;
+  fHuidigScherm := TfmLoginScherm.Create(Self);
+  fModalResult := fHuidigScherm.ShowModal;
+
+  while fModalResult <> mrAbort do begin
+    if fHuidigScherm.ClassType = TfmLoginScherm then begin
+      if fHuidigScherm.ModalResult = mrRetry then begin
+        fModalResult := fHuidigScherm.ShowModal;
+      end;
+      if fHuidigScherm.ModalResult = mrOk then begin
+        ShowMessage('volgend scherm');
+      end;
+    end;
   end;
+
+  Self.Close;
 end;
 
 end.