SOAP-752: more dialog fixes
SOAP-752: more dialog fixes