Index: AAPClient/Win32/Debug/ProScan.exe
===================================================================
diff -u -r10 -r11
Binary files differ
Index: AAPClient/UI/LoginScherm.dfm
===================================================================
diff -u -r10 -r11
--- AAPClient/UI/LoginScherm.dfm	(.../LoginScherm.dfm)	(revision 10)
+++ AAPClient/UI/LoginScherm.dfm	(.../LoginScherm.dfm)	(revision 11)
@@ -24,6 +24,7 @@
     Caption = 'Initalen:'
   end
   inherited btnLinksOnder: TButton
+    ModalResult = 3
     TabOrder = 2
     OnClick = btnLinksOnderClick
   end
@@ -32,7 +33,7 @@
   end
   inherited btnRechtsOnder: TButton
     Default = True
-    ModalResult = 11
+    ModalResult = 1
     TabOrder = 4
     OnClick = btnRechtsOnderClick
   end
Index: AAPClient/Win32/Debug/LoginScherm.dcu
===================================================================
diff -u -r10 -r11
Binary files differ
Index: AAPClient/UI/LoginScherm.pas
===================================================================
diff -u -r10 -r11
--- AAPClient/UI/LoginScherm.pas	(.../LoginScherm.pas)	(revision 10)
+++ AAPClient/UI/LoginScherm.pas	(.../LoginScherm.pas)	(revision 11)
@@ -59,11 +59,10 @@
     Request.Header := Header;
 
     Service.GebruikerAfmelden(Request);
+    Self.ModalResult := mrAbort;
   finally
     Request.Free;
   end;
-
-  ShowMessage('oink');
 end;
 
 procedure TfmLoginScherm.btnRechtsOnderClick(Sender: TObject);
@@ -83,13 +82,15 @@
     Response := Service.GebruikerAanmelden(Request);
     try
       if Response.Header.Status <> '200' then begin
+        Self.ModalResult := mrRetry;
         PopupScherm := TfmPopupScherm.Create(self);
         PopupScherm.lblWaarschuwing.Caption := Response.Header.Omschrijving;
         PopupScherm.btnPopupActie.Caption := 'Probeer opnieuw';
         PopupScherm.ShowModal;
       end else begin
         lblGebruiker.Caption := edtInitialen.Text;
         lblGebruiker.Visible := true;
+        Self.ModalResult := mrOk;
       end;
     finally
       Response.Free;
@@ -131,6 +132,7 @@
 begin
   inherited;
   btnRechtsOnder.Enabled := false;
+  SetStatusButtonRechtsOnderaan;
 end;
 
 function TfmLoginScherm.GeefInitialen: string;
Index: AAPClient/Win32/Debug/ProScanMain.dcu
===================================================================
diff -u -r10 -r11
Binary files differ
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.