Fix some welcome messages being displayed to everyone