Fixed crash in UserAttributesActivity
Merge conflicts