diff --git a/app/views/conversations/new.haml b/app/views/conversations/new.haml
index bd1e9d59d..b98f771e0 100644
--- a/app/views/conversations/new.haml
+++ b/app/views/conversations/new.haml
@@ -11,6 +11,8 @@
       selectedItemProp: "name",
       searchObjProps: "name",
       asHtmlID: "contact_ids",
+      retrieveLimit: 10,
+      minChars: 3,
       keyDelay: 0,
       startText: '',
       emptyText: '#{t('.no_results')}',
diff --git a/features/signs_up.feature b/features/signs_up.feature
index bb435d781..1796cc531 100644
--- a/features/signs_up.feature
+++ b/features/signs_up.feature
@@ -14,7 +14,7 @@ Feature: new user registration
   Scenario: new user goes through the setup wizard
    When I fill in "profile_first_name" with "O"
     And I fill in "profile_last_name" with "Hai"
-    And I fill in "profile_tag_string" with "#gender"
+    And I fill in "tags" with "#tags"
     And I press "Save and continue"
     And I wait for "step 2" to load
     Then I should see "Profile updated"