diff --git a/conf/master b/conf/master
index 404976fb9db..fcad1961c10 100644
--- a/conf/master
+++ b/conf/master
@@ -25,7 +25,7 @@
 # permissions to allow the specified user to run the master. The exception is
 # the job cache, which must be deleted if this user is changed. If the
 # modified files cause conflicts, set verify_env to False.
-#user: salt
+user: salt
 
 # Tell the master to also use salt-ssh when running commands against minions.
 #enable_ssh_minions: False
diff --git a/pkg/debian/postinst b/pkg/debian/postinst
new file mode 100644
index 00000000000..6ae0bdfa0d5
--- /dev/null
+++ b/pkg/debian/postinst
@@ -0,0 +1 @@
+adduser --system salt
diff --git a/salt/config/__init__.py b/salt/config/__init__.py
index f8d48c9ecc1..16326634749 100644
--- a/salt/config/__init__.py
+++ b/salt/config/__init__.py
@@ -75,7 +75,7 @@ else:
     _DFLT_IPC_MODE = "ipc"
     _DFLT_FQDNS_GRAINS = False
     _MASTER_TRIES = 1
-    _MASTER_USER = "salt"
+    _MASTER_USER = salt.utils.user.get_user()
 
 
 def _gather_buffer_space():