few fixes on the users