diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index d332e6f738..a745e81c19 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -929,10 +929,7 @@ def auto_auth(request):
     name_base = 'USER_'
     pass_base = 'PASS_'
 
-    max_users = 200
-    if hasattr(settings, 'MAX_AUTO_AUTH_USERS'):
-        max_users = settings.MAX_AUTO_AUTH_USERS
-
+    max_users = settings.MITX_FEATURES.get('MAX_AUTO_AUTH_USERS', 200)
     number = random.randint(1, max_users)
 
     username = name_base + str(number)
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index ae9dc86687..ffca2ed25e 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -180,6 +180,8 @@ COURSES_WITH_UNSAFE_CODE = ENV_TOKENS.get("COURSES_WITH_UNSAFE_CODE", [])
 
 # automatic log in for load testing
 MITX_FEATURES['AUTOMATIC_AUTH_FOR_LOAD_TESTING'] = ENV_TOKENS.get('AUTOMATIC_AUTH_FOR_LOAD_TESTING')
+MITX_FEATURES['MAX_AUTO_AUTH_USERS'] = ENV_TOKENS.get('MAX_AUTO_AUTH_USERS')
+
 ############################## SECURE AUTH ITEMS ###############
 # Secret things: passwords, access keys, etc.
 
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 46693eb0a5..1e274a9c1f 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -37,9 +37,6 @@ PLATFORM_NAME = "edX"
 COURSEWARE_ENABLED = True
 ENABLE_JASMINE = False
 
-# only relevant if MITX_FEATURES['AUTOMATIC_AUTH_FOR_LOAD_TESTING'] = True
-MAX_AUTO_AUTH_USERS = 200
-
 PERFSTATS = False
 
 DISCUSSION_SETTINGS = {