diff --git a/scripts/setup/generate_secrets.py b/scripts/setup/generate_secrets.py
index f8db281335..7baad7c243 100755
--- a/scripts/setup/generate_secrets.py
+++ b/scripts/setup/generate_secrets.py
@@ -25,7 +25,6 @@ CAMO_CONFIG_FILENAME = '/etc/default/camo'
 # Standard, 64-bit tokens
 AUTOGENERATED_SETTINGS = [
     'avatar_salt',
-    'initial_password_salt',
     'rabbitmq_password',
     'shared_secret',
     'thumbor_key',
@@ -84,6 +83,8 @@ def generate_secrets(development=False):
         if need_secret(name):
             add_secret(name, generate_random_token(64))
 
+    if development and need_secret("initial_password_salt"):
+        add_secret("initial_password_salt", generate_random_token(64))
     if development and need_secret("local_database_password"):
         add_secret("local_database_password", generate_random_token(64))