Various fixes for account settings
Renamed avatar filenames
Renamed avatar filenames