Move avatars saving out of backend