fixing account bootstrap code