Fix bugs with account creation