Stabilized the account creation server code after merging in the latest from the server