Index: AAPClient/UI/InfoLogScherm.pas
===================================================================
diff -u -r139 -r140
--- AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 139)
+++ AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 140)
@@ -73,9 +73,9 @@
   fWaarschuwingModalResult: TModalResult;
 begin
   Self.ModalResult := mrInfoLog;
-  fWaarschuwingModalResult := ToonPopupScherm('Scan ongedaan maken?'+sgToeleveringData.Rows[sgToeleveringData.Row][0],'Ja','Nee',true);
+  fWaarschuwingModalResult := ToonPopupScherm('Scan ongedaan maken?'+#13#10+sgToeleveringData.Rows[sgToeleveringData.Row][0],'Ja','Nee',true);
 
-  if fWaarschuwingModalResult = mrOk then begin
+  if fWaarschuwingModalResult = mrYes then begin
     Service := DnaCodeService.GetDnaCodeServiceSoap();
     // request opbouwen
     Request := DnaCodeAfmeldenRequest.Create;
Index: AAPClient/UI/PopupScherm.pas
===================================================================
diff -u -r139 -r140
--- AAPClient/UI/PopupScherm.pas	(.../PopupScherm.pas)	(revision 139)
+++ AAPClient/UI/PopupScherm.pas	(.../PopupScherm.pas)	(revision 140)
@@ -43,12 +43,14 @@
 
 procedure TfmPopupScherm.pnlbtnActie1Click(Sender: TObject);
 begin
-  Close;
+  ModalResult := mrYes;
+  CloseModal;
 end;
 
 procedure TfmPopupScherm.pnlbtnActie2Click(Sender: TObject);
 begin
-  Close;
+  ModalResult := mrNo;
+  CloseModal;
 end;
 
 end.