UI-949: Now only showing custom welcome when it exists AND is enabled