More fixes on account creation