diff --git a/docs/admin_docs/source/_static/gracedb-nav-style.css b/docs/admin_docs/source/_static/gracedb-nav-style.css
index 7254edf80dace78e7fcbea9ea142777b36b931e2..deb6f3f803ea1c2f23f27cc97fb0204cb6fe4207 100644
--- a/docs/admin_docs/source/_static/gracedb-nav-style.css
+++ b/docs/admin_docs/source/_static/gracedb-nav-style.css
@@ -104,6 +104,9 @@ h1.docnav {
 #home #nav-home a,
 #create #nav-create a,
 #search #nav-search a,
+#pipelines #nav-pipelines a,
+#alerts #nav-alerts a,
+#password #nav-password a,
 #doc #nav-doc a,
 #reports #nav-reports a,
 #feeds #nav-feeds a,
@@ -111,7 +114,6 @@ h1.docnav {
 #archive #nav-archive a,
 #lab #nav-lab a,
 #reviews #nav-reviews a,
-#userprofile #nav-userprofile a,
 #latest #nav-latest a,
 #contact #nav-contact a {
     background: #a9b0ba;  /* Nav selected color */
@@ -121,6 +123,9 @@ h1.docnav {
 #home #nav-home a:hover,
 #create #nav-create a,
 #search #nav-search a,
+#pipelines #nav-pipelines a,
+#alerts #nav-alerts a,
+#password #nav-password a,
 #doc #nav-doc a,
 #reports #nav-reports a,
 #feeds #nav-feeds a,
@@ -128,7 +133,6 @@ h1.docnav {
 #archive #nav-archive a:hover,
 #lab #nav-lab a:hover,
 #reviews #nav-reviews a:hover,
-#userprofile #nav-userprofile a:hover,
 #latest #nav-latest a:hover,
 #contact #nav-contact a:hover {
     /* background:#e35a00; */
diff --git a/docs/user_docs/source/_static/gracedb-nav-style.css b/docs/user_docs/source/_static/gracedb-nav-style.css
index 7254edf80dace78e7fcbea9ea142777b36b931e2..deb6f3f803ea1c2f23f27cc97fb0204cb6fe4207 100644
--- a/docs/user_docs/source/_static/gracedb-nav-style.css
+++ b/docs/user_docs/source/_static/gracedb-nav-style.css
@@ -104,6 +104,9 @@ h1.docnav {
 #home #nav-home a,
 #create #nav-create a,
 #search #nav-search a,
+#pipelines #nav-pipelines a,
+#alerts #nav-alerts a,
+#password #nav-password a,
 #doc #nav-doc a,
 #reports #nav-reports a,
 #feeds #nav-feeds a,
@@ -111,7 +114,6 @@ h1.docnav {
 #archive #nav-archive a,
 #lab #nav-lab a,
 #reviews #nav-reviews a,
-#userprofile #nav-userprofile a,
 #latest #nav-latest a,
 #contact #nav-contact a {
     background: #a9b0ba;  /* Nav selected color */
@@ -121,6 +123,9 @@ h1.docnav {
 #home #nav-home a:hover,
 #create #nav-create a,
 #search #nav-search a,
+#pipelines #nav-pipelines a,
+#alerts #nav-alerts a,
+#password #nav-password a,
 #doc #nav-doc a,
 #reports #nav-reports a,
 #feeds #nav-feeds a,
@@ -128,7 +133,6 @@ h1.docnav {
 #archive #nav-archive a:hover,
 #lab #nav-lab a:hover,
 #reviews #nav-reviews a:hover,
-#userprofile #nav-userprofile a:hover,
 #latest #nav-latest a:hover,
 #contact #nav-contact a:hover {
     /* background:#e35a00; */
diff --git a/gracedb/static/css/admin-nav.css b/gracedb/static/css/admin-nav.css
index 5c507c9bad8658a01781f4063793c80cc84558b3..9d22b042687a60d311299d3e3509b5411797e87d 100644
--- a/gracedb/static/css/admin-nav.css
+++ b/gracedb/static/css/admin-nav.css
@@ -65,13 +65,15 @@
 #home #nav-home a,
 #create #nav-create a,
 #search #nav-search a,
+#pipelines #nav-pipelines a,
+#alerts #nav-alerts a,
+#password #nav-password a,
 #reports #nav-reports a,
 #feeds #nav-feeds a,
 #about #nav-about a,
 #archive #nav-archive a,
 #lab #nav-lab a,
 #reviews #nav-reviews a,
-#userprofile #nav-userprofile a,
 #contact #nav-contact a {
     background: #a9b0ba;  /* Nav selected color */
     /* color:#fff;  / * Use if bg is dark */
@@ -80,13 +82,15 @@
 #home #nav-home a:hover,
 #create #nav-create a,
 #search #nav-search a,
+#pipelines #nav-pipelines a,
+#alerts #nav-alerts a,
+#password #nav-password a,
 #reports #nav-reports a,
 #feeds #nav-feeds a,
 #about #nav-about a:hover,
 #archive #nav-archive a:hover,
 #lab #nav-lab a:hover,
 #reviews #nav-reviews a:hover,
-#userprofile #nav-userprofile a:hover,
 #contact #nav-contact a:hover {
     /* background:#e35a00; */
     background: #a9b0ba;  /* Nav selected color */
diff --git a/gracedb/templates/ligoauth/manage_password.html b/gracedb/templates/ligoauth/manage_password.html
index c780a47572c317914d01320bfe0e97f2bba20ac6..ae063a5a0b9e39f240c5a8d3bf77a8dd9f587fc2 100644
--- a/gracedb/templates/ligoauth/manage_password.html
+++ b/gracedb/templates/ligoauth/manage_password.html
@@ -2,7 +2,7 @@
 
 {% block title %}Options | Password Manager{% endblock %}
 {% block heading %}Password Manager{% endblock %}
-{% block pageid %}userprofile{% endblock %}
+{% block pageid %}password{% endblock %}
 
 {% block content %}
 
diff --git a/gracedb/templates/navbar_frag.html b/gracedb/templates/navbar_frag.html
index 12d307037bbaf6ea94918a6e6e546c51d4451180..578a3e61d04b277a9d57ceb7658c16f1b0fea524 100644
--- a/gracedb/templates/navbar_frag.html
+++ b/gracedb/templates/navbar_frag.html
@@ -9,9 +9,9 @@
     {% endif %}
     <li id="nav-latest"><a href="{% url "latest" %}">Latest</a></li>
     {% if user_is_internal %}
-    <li id="nav-userprofile"><a href="{% url "alerts:index" %}">Alerts</a></li>
+    <li id="nav-alerts"><a href="{% url "alerts:index" %}">Alerts</a></li>
     {% elif user_is_lvem %}
-    <li id="nav-userprofile"><a href="{% url "manage-password" %}">Manage Password</a></li>
+    <li id="nav-password"><a href="{% url "manage-password" %}">Manage Password</a></li>
     {% endif %}
     <li id="nav-docs"><a href="{% url "home" %}documentation/">Documentation</a></li>
     {% if user %}