diff --git a/openstack_dashboard/dashboards/project/vpn/forms.py b/openstack_dashboard/dashboards/project/vpn/forms.py
index ac4e0434a2..7a3c52c471 100644
--- a/openstack_dashboard/dashboards/project/vpn/forms.py
+++ b/openstack_dashboard/dashboards/project/vpn/forms.py
@@ -247,6 +247,7 @@ class UpdateIPSecSiteConnection(forms.SelfHandlingForm):
         version=forms.IPv4 | forms.IPv6,
         mask=True)
     psk = forms.CharField(
+        widget=forms.PasswordInput(render_value=True),
         max_length=80, label=_("Pre-Shared Key (PSK) string"))
     mtu = forms.IntegerField(
         min_value=68,
diff --git a/openstack_dashboard/dashboards/project/vpn/templates/vpn/_ipsecsiteconnection_details.html b/openstack_dashboard/dashboards/project/vpn/templates/vpn/_ipsecsiteconnection_details.html
index 1a125525bf..6da4746990 100644
--- a/openstack_dashboard/dashboards/project/vpn/templates/vpn/_ipsecsiteconnection_details.html
+++ b/openstack_dashboard/dashboards/project/vpn/templates/vpn/_ipsecsiteconnection_details.html
@@ -39,9 +39,6 @@
       {% endfor %}
     </dd>
 
-    <dt>{% trans "Pre-Shared Key string" %}</dt>
-    <dd>{{ ipsecsiteconnection.psk }}</dd>
-
     <dt>{% trans "MTU" %}</dt>
     <dd>{{ ipsecsiteconnection.mtu }}</dd>
 
diff --git a/openstack_dashboard/dashboards/project/vpn/workflows.py b/openstack_dashboard/dashboards/project/vpn/workflows.py
index c5db0e3b4c..f8b52aa815 100644
--- a/openstack_dashboard/dashboards/project/vpn/workflows.py
+++ b/openstack_dashboard/dashboards/project/vpn/workflows.py
@@ -340,6 +340,7 @@ class AddIPSecSiteConnectionAction(workflows.Action):
     psk = forms.CharField(
         max_length=80,
         label=_("Pre-Shared Key (PSK) string"),
+        widget=forms.PasswordInput(render_value=False),
         help_text=_("The pre-defined key string "
                     "between the two peers of the VPN connection"))