Moved OSGPKI-393 notification outside of the if statement