further improvements of users module