Modifications to sign up / sign in flow