Fix to issue where user id was not taken into consideration.