SOAP-752: more dialog fixes