FIX mapping of userId now set correctly except for profileattribute