bugfixes + cleanup for accounts and users routes