Merge "Fix header when editing a profile"