Fix create account behavior