callback if certification is enabled and is certified, otherwise pop up the dialog
fix tests
Merge pull request #1251 from jay-hodgson/SWC-1788

Swc-1807, SWC-1803