diff --git a/puppet/zulip/manifests/base.pp b/puppet/zulip/manifests/base.pp
index bbf5275c68..ff80d665ad 100644
--- a/puppet/zulip/manifests/base.pp
+++ b/puppet/zulip/manifests/base.pp
@@ -22,13 +22,12 @@ class zulip::base {
 
   group { 'zulip':
     ensure     => present,
-    gid        => '1000',
   }
+
   user { 'zulip':
     ensure     => present,
-    uid        => '1000',
-    gid        => '1000',
     require    => Group['zulip'],
+    gid        => 'zulip',
     shell      => '/bin/bash',
     home       => '/home/zulip',
     managehome => true,
diff --git a/scripts/lib/install b/scripts/lib/install
index d833b216e2..12490ba93c 100755
--- a/scripts/lib/install
+++ b/scripts/lib/install
@@ -25,7 +25,7 @@ if [ -e "/etc/init.d/nginx" ]; then
 fi
 
 /root/zulip/scripts/setup/generate_enterprise_secrets.py
-mv /root/zulip/zproject/local_settings_generated.py /etc/zulip/settings.py
+mv /root/zulip/zproject/local_settings_template.py /etc/zulip/settings.py
 ln -nsf /etc/zulip/settings.py /root/zulip/zproject/local_settings.py
 
 /root/zulip/scripts/setup/configure-rabbitmq