Commenting avatars and user rights mixed up

BAC-1276

@prein / @michalroszka / @owend