diff --git a/CMakeLists.txt b/CMakeLists.txt
index f34d500..5038610 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,7 @@ set(BASE_TARGETS concordia-server)
 
 set (STOP_WORDS_ENABLED "false")
 
+set (UNIX_USER $ENV{USER})
 
 # ================================================
 # Config
diff --git a/upstart/cmake_stubs/pgbouncer.conf.in b/upstart/cmake_stubs/pgbouncer.conf.in
index 3b40730..0224a49 100644
--- a/upstart/cmake_stubs/pgbouncer.conf.in
+++ b/upstart/cmake_stubs/pgbouncer.conf.in
@@ -15,6 +15,6 @@ respawn limit 10 30
 expect fork
 
 script
-    exec pgbouncer -u rafalj @concordia-server_SOURCE_DIR@/db/pgbouncer.ini &
+    exec pgbouncer -u @UNIX_USER@ @concordia-server_SOURCE_DIR@/db/pgbouncer.ini &
     sleep 4
 end script