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;