#59 - Even more sorting out profile vs id problem