diff --git a/changelog.d/6490.doc b/changelog.d/6490.doc
new file mode 100644
index 000000000000..6db351d7db72
--- /dev/null
+++ b/changelog.d/6490.doc
@@ -0,0 +1 @@
+Update documentation and variables in user contributed systemd reference file.
diff --git a/contrib/systemd/matrix-synapse.service b/contrib/systemd/matrix-synapse.service
index 38d369ea3d49..813717b032d7 100644
--- a/contrib/systemd/matrix-synapse.service
+++ b/contrib/systemd/matrix-synapse.service
@@ -4,8 +4,11 @@
 #    systemctl enable matrix-synapse
 #    systemctl start matrix-synapse
 #
+# This assumes that Synapse has been installed by a user named
+# synapse.
+#
 # This assumes that Synapse has been installed in a virtualenv in
-# /opt/synapse/env.
+# the user's home directory: `/home/synapse/synapse/env`.
 #
 # **NOTE:** This is an example service file that may change in the future. If you
 # wish to use this please copy rather than symlink it.
@@ -22,8 +25,8 @@ Restart=on-abort
 User=synapse
 Group=nogroup
 
-WorkingDirectory=/opt/synapse
-ExecStart=/opt/synapse/env/bin/python -m synapse.app.homeserver --config-path=/opt/synapse/homeserver.yaml
+WorkingDirectory=/home/synapse/synapse
+ExecStart=/home/synapse/synapse/env/bin/python -m synapse.app.homeserver --config-path=/home/synapse/synapse/homeserver.yaml
 SyslogIdentifier=matrix-synapse
 
 # adjust the cache factor if necessary
diff --git a/synapse/storage/data_stores/main/profile.py b/synapse/storage/data_stores/main/profile.py
index 8ab67a6b9167..3dc445144775 100644
--- a/synapse/storage/data_stores/main/profile.py
+++ b/synapse/storage/data_stores/main/profile.py
@@ -159,9 +159,9 @@ def set_profile_active(self, user_localpart, active, hide, batchnum):
 
 
 class ProfileStore(ProfileWorkerStore):
-    def __init__(self, db_conn, hs):
+    def __init__(self, database, db_conn, hs):
 
-        super(ProfileStore, self).__init__(db_conn, hs)
+        super(ProfileStore, self).__init__(database, db_conn, hs)
 
         self.db.updates.register_background_index_update(
             "profile_replication_status_host_index",