diff --git a/api/models/initiate_database.py b/api/models/initiate_database.py
index 6f370f8..99b8cc3 100644
--- a/api/models/initiate_database.py
+++ b/api/models/initiate_database.py
@@ -7,7 +7,7 @@
     exit()
 
 from sqlalchemy import create_engine
-engine = create_engine('postgresql://' + settings["postgreql_username"] + ':' + settings["postgreql_password"] + '@localhost/' + settings["postgres_db"] + '?client_encoding=utf8', pool_recycle=60, encoding='utf8')
+engine = create_engine('postgresql://' + settings["postgreql_username"] + ':' + settings["postgreql_password"] + '@' settings["postgres_server"] + '/' + settings["postgres_db"] + '?client_encoding=utf8', pool_recycle=60, encoding='utf8')
 from sqlalchemy.ext.declarative import declarative_base
 Base = declarative_base()
 from sqlalchemy import Column, Integer, String, func, update, Text, Binary, Boolean, BigInteger, event, select, exc
diff --git a/generate_config.py b/generate_config.py
index 2af17d7..0101f10 100755
--- a/generate_config.py
+++ b/generate_config.py
@@ -151,6 +151,10 @@
 print "(ex. xsshunter)"
 settings["postgres_db"] = raw_input( "Postgres DB: ")
 print ""
+print "What is the postgres server address? "
+print "(ex. localhost, localhos:5432, IP, container_name)"
+settings["postgres_server"] = raw_input( "Postgres Server: ")
+print ""
 print "Generating cookie secret..."
 settings["cookie_secret"] = binascii.hexlify( os.urandom(50) )