diff --git a/avatar/conf.py b/avatar/conf.py
index e25ee91..944520b 100644
--- a/avatar/conf.py
+++ b/avatar/conf.py
@@ -25,5 +25,5 @@ class AvatarConf(AppConf):
     AUTO_GENERATE_SIZES = (DEFAULT_SIZE,)
 
     def configure_auto_generate_avatar_sizes(self, value):
-        return value or getattr(settings, 'AUTO_GENERATE_AVATAR_SIZES',
+        return value or getattr(settings, 'AVATAR_AUTO_GENERATE_SIZES',
                                 (self.DEFAULT_SIZE,))
diff --git a/docs/index.txt b/docs/index.txt
index c1dda78..4e33b54 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -94,7 +94,7 @@ Global Settings
 There are a number of settings available to easily customize the avatars that
 appear on the site. Listed below are those settings:
 
-AUTO_GENERATE_AVATAR_SIZES
+AVATAR_AUTO_GENERATE_SIZES
     An iterable of integers representing the sizes of avatars to generate on
     upload. This can save rendering time later on if you pre-generate the
     resized versions. Defaults to ``(80,)``