User <-> Profile mapping fix