Fixed bugs in new account template