diff --git a/servers/configure-rabbitmq b/scripts/setup/configure-rabbitmq
similarity index 71%
rename from servers/configure-rabbitmq
rename to scripts/setup/configure-rabbitmq
index fa71eba98a..42d03025cd 100755
--- a/servers/configure-rabbitmq
+++ b/scripts/setup/configure-rabbitmq
@@ -4,6 +4,6 @@
 # with a real password
 
 rabbitmqctl delete_user guest
-rabbitmqctl add_user zulip $($(dirname $0)/../tools/get-django-setting RABBITMQ_PASSWORD)
+rabbitmqctl add_user zulip $($(dirname $0)/../../tools/get-django-setting RABBITMQ_PASSWORD)
 rabbitmqctl set_user_tags zulip administrator
 rabbitmqctl set_permissions -p / zulip '.*' '.*' '.*'
diff --git a/servers/puppet/modules/zulip/manifests/rabbit.pp b/servers/puppet/modules/zulip/manifests/rabbit.pp
index 7de7691d67..b60bfb6ba3 100644
--- a/servers/puppet/modules/zulip/manifests/rabbit.pp
+++ b/servers/puppet/modules/zulip/manifests/rabbit.pp
@@ -26,7 +26,7 @@ class zulip::rabbit {
     group  => "root",
     mode => 644,
     source => "puppet:///modules/zulip/rabbitmq/rabbitmq-server",
-  } 
+  }
 
   file { "/etc/rabbitmq/rabbitmq.config":
     require => Package[rabbitmq-server],
@@ -37,5 +37,5 @@ class zulip::rabbit {
     source => "puppet:///modules/zulip/rabbitmq/rabbitmq.config",
   }
 
-  # TODO: Should also call exactly once "servers/configure-rabbitmq"
+  # TODO: Should also call exactly once "configure-rabbitmq"
 }
diff --git a/zproject/local_settings.py b/zproject/local_settings.py
index c2e209b94b..6419ae9987 100644
--- a/zproject/local_settings.py
+++ b/zproject/local_settings.py
@@ -23,7 +23,6 @@ INITIAL_PASSWORD_SALT = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 # FIXME: store this password more securely
 SHARED_SECRET = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
 
-# This password also appears in servers/configure-rabbitmq
 RABBITMQ_PASSWORD = 'xxxxxxxxxxxxxxxx'
 
 MAILCHIMP_API_KEY = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-us4'