diff --git a/pkg/user/manager/demo/demo.go b/pkg/user/manager/demo/demo.go
index 77447f71cce..3eadeab7183 100644
--- a/pkg/user/manager/demo/demo.go
+++ b/pkg/user/manager/demo/demo.go
@@ -80,9 +80,9 @@ func extractClaim(u *userpb.User, claim string) (string, error) {
 	return "", errors.New("demo: invalid field")
 }
 
-// TODO(jfd) search Opaque? compare sub?
+// TODO(jfd) compare sub?
 func userContains(u *userpb.User, query string) bool {
-	return strings.Contains(u.Username, query) || strings.Contains(u.DisplayName, query) || strings.Contains(u.Mail, query)
+	return strings.Contains(u.Username, query) || strings.Contains(u.DisplayName, query) || strings.Contains(u.Mail, query) || strings.Contains(u.Id.OpaqueId, query)
 }
 
 func (m *manager) FindUsers(ctx context.Context, query string) ([]*userpb.User, error) {