Merge "Fix wrong user in personal profile" into udc-dev