Minor fixes for creating account