what I hope will be some login/logout avatar fixes