fixed user and adoption flow