Fixes for account creation