diff --git a/plugins/postgresql/index.py b/plugins/postgresql/index.py
index ed41921fa..266ebc2bb 100755
--- a/plugins/postgresql/index.py
+++ b/plugins/postgresql/index.py
@@ -272,7 +272,10 @@ def initPgPwd():
     serverdir = getServerDir()
     pwd = mw.getRandomString(16)
 
-    cmd_pass = serverdir + '/bin/createuser -s postgres'
+    cmd_pass = serverdir + '/bin/createuser -s -r postgres'
+
+    if not mw.isAppleSystem():
+        cmd_pass = 'su - postgres -c "' + cmd_pass + '"'
     data = mw.execShell(cmd_pass)
 
     cmd_pass = "echo \"alter user postgres with password '" + pwd + "'\" | "