Merge "Pass correct user id for the extra" into klp-dev