diff --git a/pkg/controller/account/search.go b/pkg/controller/account/search.go
index b70162f..68a67f9 100644
--- a/pkg/controller/account/search.go
+++ b/pkg/controller/account/search.go
@@ -82,6 +82,13 @@ func Search() http.HandlerFunc {
 			isCertified = "true"
 		}
 
+		// Always filter for certified-only users unless the request specifically looked for non-certified.
+		// Searches for disabled/banned users (admin only) should also reveal ALL users including non-certified.
+		var certifiedOnly = true
+		if isCertified == "false" || isCertified == "all" || isCertified == "disabled" || isCertified == "banned" {
+			certifiedOnly = false
+		}
+
 		pager := &models.Pagination{
 			PerPage: config.PageSizeMemberSearch,
 			Sort:    sort,
@@ -95,7 +102,7 @@ func Search() http.HandlerFunc {
 			MaritalStatus: maritalStatus,
 			HereFor:       hereFor,
 			ProfileText:   search,
-			Certified:     isCertified == "true",
+			Certified:     certifiedOnly,
 			NotCertified:  isCertified == "false",
 			InnerCircle:   isCertified == "circle",
 			ShyAccounts:   isCertified == "shy",