From ab642344d4a9697d3bb62e047c8484aade4a2793 Mon Sep 17 00:00:00 2001
From: Rahul Shirsat <rahul.shirsat@enterprisedb.com>
Date: Fri, 29 Jan 2021 11:32:27 +0530
Subject: [PATCH] Ensure that username should be visible in the 'Connect to
 Server' popup when service and user name both specified. Fixes #5871

---
 docs/en_US/release_notes.rst                  |  1 +
 docs/en_US/release_notes_5_0.rst              | 20 +++++++++++++++++++
 .../servers/templates/servers/password.html   |  6 +++---
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 docs/en_US/release_notes_5_0.rst

diff --git a/docs/en_US/release_notes.rst b/docs/en_US/release_notes.rst
index 2abf0a8ea..db4ecfada 100644
--- a/docs/en_US/release_notes.rst
+++ b/docs/en_US/release_notes.rst
@@ -11,6 +11,7 @@ notes for it.
 .. toctree::
    :maxdepth: 1
 
+   release_notes_5_0
    release_notes_4_30
    release_notes_4_29
    release_notes_4_28
diff --git a/docs/en_US/release_notes_5_0.rst b/docs/en_US/release_notes_5_0.rst
new file mode 100644
index 000000000..796ef7932
--- /dev/null
+++ b/docs/en_US/release_notes_5_0.rst
@@ -0,0 +1,20 @@
+************
+Version 5.0
+************
+
+Release date: 2021-02-25
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 4.30.
+
+New features
+************
+
+
+Housekeeping
+************
+
+
+Bug fixes
+*********
+
+| `Issue #5871 <https://redmine.postgresql.org/issues/5871>`_ -  Ensure that username should be visible in the 'Connect to Server' popup when service and user name both specified.
diff --git a/web/pgadmin/browser/server_groups/servers/templates/servers/password.html b/web/pgadmin/browser/server_groups/servers/templates/servers/password.html
index 35f4e2a16..5ed1fc4af 100644
--- a/web/pgadmin/browser/server_groups/servers/templates/servers/password.html
+++ b/web/pgadmin/browser/server_groups/servers/templates/servers/password.html
@@ -1,11 +1,11 @@
 <form name="frmPassword" id="frmPassword" style="height: 100%; width: 100%" onsubmit="return false;">
     <div>
         <div><span class="font-weight-bold" >
-            {% if service  %}
-                {{ _('Please enter the password for the user to connect the server - "{0}"').format(server_label) }}
-            {% else %}
+            {% if username %}
                 {{ _('Please enter the password for the user \'{0}\' to connect the server - "{1}"').format(username,
                 server_label) }}
+            {% else %}
+                {{ _('Please enter the password for the user to connect the server - "{0}"').format(server_label) }}
             {% endif %}
         </span></div>
         <div class="input-group row py-2">