Bug fix user flow