diff --git a/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml b/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml
index fee7c0dfe..949b3ee2d 100644
--- a/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml
+++ b/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml
@@ -3,6 +3,7 @@
     <datastore-index kind="ContactResource" ancestor="false" source="manual">
         <property name="currentSponsorClientId" direction="asc"/>
         <property name="deletionTime" direction="asc"/>
+        <property name="searchName" direction="asc"/>
     </datastore-index>
     <!-- For finding domain resources by registrar. -->
     <datastore-index kind="DomainBase" ancestor="false" source="manual">
diff --git a/javatests/google/registry/rdap/RdapEntitySearchActionTest.java b/javatests/google/registry/rdap/RdapEntitySearchActionTest.java
index b69a6a94e..686517fb7 100644
--- a/javatests/google/registry/rdap/RdapEntitySearchActionTest.java
+++ b/javatests/google/registry/rdap/RdapEntitySearchActionTest.java
@@ -439,6 +439,20 @@ public class RdapEntitySearchActionTest {
     runSuccessfulNameTestWithBlinky("Blinky*", "rdap_contact.json");
   }
 
+  @Test
+  public void testNameMatchContact_found_wildcardSpecifyingSameRegistrar() throws Exception {
+    login("2-RegistrarTest");
+    action.registrarParam = Optional.of("2-RegistrarTest");
+    runSuccessfulNameTestWithBlinky("Blinky*", "rdap_contact.json");
+  }
+
+  @Test
+  public void testNameMatchContact_notFound_wildcardSpecifyingOtherRegistrar() throws Exception {
+    login("2-RegistrarTest");
+    action.registrarParam = Optional.of("2-RegistrarInact");
+    runNotFoundNameTest("Blinky*");
+  }
+
   @Test
   public void testNameMatchContact_found_wildcardBoth() throws Exception {
     login("2-RegistrarTest");
@@ -656,6 +670,21 @@ public class RdapEntitySearchActionTest {
     runSuccessfulHandleTestWithBlinky("2-RO*", "rdap_contact.json");
   }
 
+  @Test
+  public void testHandleMatchContact_found_wildcardSpecifyingSameRegistrar() throws Exception {
+    action.registrarParam = Optional.of("2-RegistrarTest");
+    login("2-RegistrarTest");
+    runSuccessfulHandleTestWithBlinky("2-RO*", "rdap_contact.json");
+  }
+
+  @Test
+  public void testHandleMatchContact_notFound_wildcardSpecifyingDifferentRegistrar()
+      throws Exception {
+    action.registrarParam = Optional.of("2-Registrar");
+    login("2-RegistrarTest");
+    runNotFoundHandleTest("2-RO*");
+  }
+
   @Test
   public void testHandleMatchContact_notFound_wildcard() throws Exception {
     runNotFoundHandleTest("20*");