diff --git a/src/serviceconnector-passwordless/HISTORY.rst b/src/serviceconnector-passwordless/HISTORY.rst
index f71aa2a25e1..e98db4e3d08 100644
--- a/src/serviceconnector-passwordless/HISTORY.rst
+++ b/src/serviceconnector-passwordless/HISTORY.rst
@@ -2,6 +2,10 @@
 
 Release History
 ===============
+2.0.4
+++++++
+* Fix PostgreSQL connection string format
+
 2.0.3
 ++++++
 * Prompt confirmation when update PostgreSQL server
diff --git a/src/serviceconnector-passwordless/azext_serviceconnector_passwordless/_credential_free.py b/src/serviceconnector-passwordless/azext_serviceconnector_passwordless/_credential_free.py
index 2a6335463e1..fe8ae329df9 100644
--- a/src/serviceconnector-passwordless/azext_serviceconnector_passwordless/_credential_free.py
+++ b/src/serviceconnector-passwordless/azext_serviceconnector_passwordless/_credential_free.py
@@ -821,7 +821,7 @@ def get_connection_string(self):
             'az account get-access-token --resource-type oss-rdbms').get('accessToken')
 
         # extension functions require the extension to be available, which is the case for postgres (default) database.
-        conn_string = "host={} user={} dbname=postgres password={} sslmode=require".format(
+        conn_string = "host={} user='{}' dbname=postgres password={} sslmode=require".format(
             self.host, self.admin_username, password)
         return conn_string
 
@@ -926,7 +926,7 @@ def get_connection_string(self):
             'az account get-access-token --resource-type oss-rdbms').get('accessToken')
 
         # extension functions require the extension to be available, which is the case for postgres (default) database.
-        conn_string = "host={} user={} dbname={} password={} sslmode=require".format(
+        conn_string = "host={} user='{}' dbname='{}' password={} sslmode=require".format(
             self.host, self.admin_username + '@' + self.db_server, self.dbname, password)
         return conn_string
 
diff --git a/src/serviceconnector-passwordless/azext_serviceconnector_passwordless/config.py b/src/serviceconnector-passwordless/azext_serviceconnector_passwordless/config.py
index f1c8e8314b8..cbe2de4b611 100644
--- a/src/serviceconnector-passwordless/azext_serviceconnector_passwordless/config.py
+++ b/src/serviceconnector-passwordless/azext_serviceconnector_passwordless/config.py
@@ -4,5 +4,5 @@
 # --------------------------------------------------------------------------------------------
 
 
-VERSION = '2.0.3'
+VERSION = '2.0.4'
 NAME = 'serviceconnector-passwordless'