#59 - More sorting out profile vs id problem