small accounts manager fixes