Change state transistions and fix reset pwd/signup