Fix few bugs in account creation