fix user settings and avatar