Fix permission error when editing profile from sub-org
Merge branch 'MH-588' into dev