Fixed edit except for avatar upload