Fixes #698 - uploaded avatar was being removed unintentionally.