diff --git src/bp-templates/bp-nouveau/css/twentytwentyone-rtl.css src/bp-templates/bp-nouveau/css/twentytwentyone-rtl.css
index 7cb601377..466ccab25 100644
--- src/bp-templates/bp-nouveau/css/twentytwentyone-rtl.css
+++ src/bp-templates/bp-nouveau/css/twentytwentyone-rtl.css
@@ -1057,10 +1057,6 @@ body.activity-permalink #buddypress.twentytwentyone .activity-list .activity-ava
 	color: var(--global--color-black);
 }
 
-#buddypress.twentytwentyone .wp-pwd:not(.is-open) {
-	display: none;
-}
-
 #buddypress.twentytwentyone input[type="checkbox"],
 #buddypress.twentytwentyone input[type="radio"] {
 	width: 25px;
@@ -1116,6 +1112,10 @@ body.activity-permalink #buddypress.twentytwentyone .activity-list .activity-ava
 	background-color: var(--global--color-background);
 }
 
+body.bp-user.my-account #buddypress.twentytwentyone .wp-pwd:not(.is-open) {
+	display: none;
+}
+
 /**
 *----------------------------------------------------------
 * @section 6.1 - Directory Search
diff --git src/bp-templates/bp-nouveau/css/twentytwentyone.css src/bp-templates/bp-nouveau/css/twentytwentyone.css
index 1c5ad46ee..3691a6281 100644
--- src/bp-templates/bp-nouveau/css/twentytwentyone.css
+++ src/bp-templates/bp-nouveau/css/twentytwentyone.css
@@ -1057,10 +1057,6 @@ body.activity-permalink #buddypress.twentytwentyone .activity-list .activity-ava
 	color: var(--global--color-black);
 }
 
-#buddypress.twentytwentyone .wp-pwd:not(.is-open) {
-	display: none;
-}
-
 #buddypress.twentytwentyone input[type="checkbox"],
 #buddypress.twentytwentyone input[type="radio"] {
 	width: 25px;
@@ -1116,6 +1112,10 @@ body.activity-permalink #buddypress.twentytwentyone .activity-list .activity-ava
 	background-color: var(--global--color-background);
 }
 
+body.bp-user.my-account #buddypress.twentytwentyone .wp-pwd:not(.is-open) {
+	display: none;
+}
+
 /**
 *----------------------------------------------------------
 * @section 6.1 - Directory Search
diff --git src/bp-templates/bp-nouveau/sass/twentytwentyone.scss src/bp-templates/bp-nouveau/sass/twentytwentyone.scss
index 9958c6df4..83fef4114 100644
--- src/bp-templates/bp-nouveau/sass/twentytwentyone.scss
+++ src/bp-templates/bp-nouveau/sass/twentytwentyone.scss
@@ -1424,13 +1424,6 @@ body {
 		}
 	}
 
-	.wp-pwd {
-
-		&:not(.is-open) {
-			display: none;
-		}
-	}
-
 	input[type="checkbox"],
 	input[type="radio"] {
 		width: 25px;
@@ -1494,6 +1487,19 @@ body {
 	}
 }
 
+body.bp-user.my-account {
+
+	#buddypress.twentytwentyone {
+
+		.wp-pwd {
+
+			&:not(.is-open) {
+				display: none;
+			}
+		}
+	}
+}
+
 
 /**
 *----------------------------------------------------------