Temporary handling for user SkipOriginCheck flag