updated with user login fix
group counts fixed