modify to use EL; complete account editing