Updated user edit form with profile2 support