diff --git a/bitnami/pgpool/4/ol-7/Dockerfile b/bitnami/pgpool/4/ol-7/Dockerfile
index 7ab1913b94f9..7e26031f47cc 100644
--- a/bitnami/pgpool/4/ol-7/Dockerfile
+++ b/bitnami/pgpool/4/ol-7/Dockerfile
@@ -13,7 +13,7 @@ RUN . ./libcomponent.sh && component_unpack "pgpool" "4.0.6-1" --checksum 18034b
 COPY rootfs /
 RUN /postunpack.sh
 ENV BITNAMI_APP_NAME="pgpool" \
-    BITNAMI_IMAGE_VERSION="4.0.6-ol-7-r27" \
+    BITNAMI_IMAGE_VERSION="4.0.6-ol-7-r28" \
     PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/pgpool/bin:$PATH"
 
 EXPOSE 5432
diff --git a/bitnami/pgpool/4/ol-7/rootfs/libpgpool.sh b/bitnami/pgpool/4/ol-7/rootfs/libpgpool.sh
index c9718e85dc87..b04a0f4e6be3 100644
--- a/bitnami/pgpool/4/ol-7/rootfs/libpgpool.sh
+++ b/bitnami/pgpool/4/ol-7/rootfs/libpgpool.sh
@@ -48,7 +48,7 @@ export PGPOOL_DAEMON_GROUP="pgpool"
 export PGPOOL_PORT_NUMBER="${PGPOOL_PORT_NUMBER:-5432}"
 export PGPOOL_BACKEND_NODES="${PGPOOL_BACKEND_NODES:-}"
 export PGPOOL_SR_CHECK_USER="${PGPOOL_SR_CHECK_USER:-}"
-export PGPOOL_USERNAME="${PGPOOL_USERNAME:-postgresql}"
+export PGPOOL_USERNAME="${PGPOOL_USERNAME:-postgres}"
 export PGPOOL_ENABLE_LDAP="${PGPOOL_ENABLE_LDAP:-no}"
 export PGPOOL_TIMEOUT="360"
 
@@ -161,6 +161,7 @@ pgpool_create_pghba() {
     cat > "$PGPOOL_PGHBA_FILE" << EOF
 local    all             all                            trust
 host     all             $PGPOOL_SR_CHECK_USER       all         trust
+host     all             $PGPOOL_USERNAME       all         trust
 host     all             wide               all         trust
 host     all             pop_user           all         trust
 host     all             all                all         $authentication
@@ -236,8 +237,6 @@ EOF
 #########################
 pgpool_create_config() {
     local -i node_counter=0
-    local pwd_file="$PGPOOL_PWD_FILE"
-    is_boolean_yes "$PGPOOL_ENABLE_LDAP" && pwd_file=""
 
     info "Generating pgpool.conf file..."
     # Configuring Pgpool-II to use the streaming replication mode since it's the recommended way
@@ -254,7 +253,7 @@ pgpool_create_config() {
     # Authentication settings
     # ref: http://www.pgpool.net/docs/latest/en/html/runtime-config-connection.html#RUNTIME-CONFIG-AUTHENTICATION-SETTINGS
     pgpool_set_property "enable_pool_hba" "on"
-    pgpool_set_property "pool_passwd" "$pwd_file"
+    pgpool_set_property "pool_passwd" "$PGPOOL_PWD_FILE"
     pgpool_set_property "authentication_timeout" "30"
     # Connection Pooling settings
     # http://www.pgpool.net/docs/latest/en/html/runtime-config-connection-pooling.html
@@ -391,8 +390,7 @@ pgpool_initialize() {
         pgpool_create_config
         if is_boolean_yes "$PGPOOL_ENABLE_LDAP"; then
             pgpool_ldap_config
-        else
-            pgpool_generate_password_file
         fi
+        pgpool_generate_password_file
     fi
 }
diff --git a/bitnami/pgpool/README.md b/bitnami/pgpool/README.md
index 1c0ca1970853..b2bc05c6ad2f 100644
--- a/bitnami/pgpool/README.md
+++ b/bitnami/pgpool/README.md
@@ -39,7 +39,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/).
 
 
-* [`4-ol-7`, `4.0.6-ol-7-r27` (4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-ol-7-r27/4/ol-7/Dockerfile)
+* [`4-ol-7`, `4.0.6-ol-7-r28` (4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-ol-7-r28/4/ol-7/Dockerfile)
 * [`4-debian-9`, `4.0.6-debian-9-r26`, `4`, `4.0.6`, `4.0.6-r26`, `latest` (4/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-debian-9-r26/4/debian-9/Dockerfile)
 * [`4-centos-7`, `4.0.6-centos-7-r27` (4/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-centos-7-r27/4/centos-7/Dockerfile)