Fixes to demo account creation