account now uses forms layout and includes users email