Refine dialogs

@cleercode, PTAL: a follow-up to #2439.