[bug 1074847] User profile API + editiable profile
Fix bad merge.