Add redirect to improve flows for user