Slightly modify welcome flow