Modify message to allow minus and underscore