diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index 5668759882..c39561f89c 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -30,13 +30,13 @@ def new_site(site, mariadb_root_username=None, mariadb_root_password=None, admin
 	_new_site(db_name, site, mariadb_root_username=mariadb_root_username,
 			mariadb_root_password=mariadb_root_password, admin_password=admin_password,
 			verbose=verbose, install_apps=install_app, source_sql=source_sql, force=force,
-			db_type = db_type)
+			db_type=db_type)
 
 	if len(frappe.utils.get_sites()) == 1:
 		use(site)
 
 def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=None,
-	admin_password=None, verbose=False, install_apps=None, source_sql=None,force=False,
+	admin_password=None, verbose=False, install_apps=None, source_sql=None, force=False,
 	reinstall=False, db_type=None):
 	"""Install a new Frappe site"""
 
@@ -67,7 +67,7 @@ def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=N
 
 		install_db(root_login=mariadb_root_username, root_password=mariadb_root_password,
 			db_name=db_name, admin_password=admin_password, verbose=verbose,
-			source_sql=source_sql,force=force, reinstall=reinstall, db_type=db_type)
+			source_sql=source_sql, force=force, reinstall=reinstall, db_type=db_type)
 
 		apps_to_install = ['frappe'] + (frappe.conf.get("install_apps") or []) + (list(install_apps) or [])
 		for app in apps_to_install:
diff --git a/frappe/database/postgres/database.py b/frappe/database/postgres/database.py
index 610f15e011..b72f5b8380 100644
--- a/frappe/database/postgres/database.py
+++ b/frappe/database/postgres/database.py
@@ -65,7 +65,7 @@ class PostgresDatabase(Database):
 
 	def get_connection(self):
 		# warnings.filterwarnings('ignore', category=psycopg2.Warning)
-		conn = psycopg2.connect('host={} dbname={} user={} password={} port={}'.format(
+		conn = psycopg2.connect("host='{}' dbname='{}' user='{}' password='{}' port={}".format(
 			self.host, self.user, self.user, self.password, self.port
 		))
 		conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT) # TODO: Remove this
diff --git a/frappe/installer.py b/frappe/installer.py
index 4c97ffd8fc..764a0b6780 100755
--- a/frappe/installer.py
+++ b/frappe/installer.py
@@ -26,7 +26,6 @@ def install_db(root_login="root", root_password=None, db_name=None, source_sql=N
 	if not db_type:
 		db_type = frappe.conf.db_type or 'mariadb'
 
-
 	make_conf(db_name, site_config=site_config, db_type=db_type)
 	frappe.flags.in_install_db = True
 
@@ -44,7 +43,6 @@ def install_db(root_login="root", root_password=None, db_name=None, source_sql=N
 
 	frappe.flags.in_install_db = False
 
-
 def install_app(name, verbose=False, set_as_patched=True):
 	frappe.flags.in_install = name
 	frappe.flags.ignore_in_install = False