Issue 5716 - Allow removal of avatar

Fix conditional

Modify comment