diff --git a/backend/src/uxbox/config.clj b/backend/src/uxbox/config.clj
index 71b97e44d..5269d695a 100644
--- a/backend/src/uxbox/config.clj
+++ b/backend/src/uxbox/config.clj
@@ -36,6 +36,8 @@
   {:http-server-port (lookup-env env :uxbox-http-server-port 6060)
    :http-server-debug (lookup-env env :uxbox-http-server-debug true)
    :http-server-cors (lookup-env env :uxbox-http-server-cors "http://localhost:3449")
+   :database-username (lookup-env env :uxbox-database-username nil)
+   :database-password (lookup-env env :uxbox-database-password nil)
    :database-uri (lookup-env env :uxbox-database-uri "jdbc:postgresql://127.0.0.1/uxbox")
    :media-directory (lookup-env env :uxbox-media-directory "resources/public/media")
    :media-uri (lookup-env env :uxbox-media-uri "http://localhost:6060/media/")
diff --git a/backend/src/uxbox/db.clj b/backend/src/uxbox/db.clj
index 7d80bf495..a3083df7c 100644
--- a/backend/src/uxbox/db.clj
+++ b/backend/src/uxbox/db.clj
@@ -32,7 +32,10 @@
 
 (defn get-db-config
   [config]
-  (assoc connection-defaults :jdbc-url (:database-uri config)))
+  (assoc connection-defaults
+         :username (:database-username config)
+         :password (:database-password config)
+         :jdbc-url (:database-uri config)))
 
 (defn create-datasource
   [config]