diff --git a/app/assets/javascripts/app/controllers/_ui_element/autocompletion_ajax.coffee b/app/assets/javascripts/app/controllers/_ui_element/autocompletion_ajax.coffee
index 09316dd44..d6a15334d 100644
--- a/app/assets/javascripts/app/controllers/_ui_element/autocompletion_ajax.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/autocompletion_ajax.coffee
@@ -14,7 +14,8 @@ class App.UiElement.autocompletion_ajax
         name:        attribute.name
         id:          params.organization_id || attribute.value
         placeholder: App.i18n.translateInline('Search...')
-        limt:        10
+        limit:       40
         object:      attribute.relation
+        ajax:        true
     )
     searchableAjaxSelectObject.element()
diff --git a/app/assets/javascripts/app/views/generic/searchable_select.jst.eco b/app/assets/javascripts/app/views/generic/searchable_select.jst.eco
index 91629dbb1..4ed94fe1a 100644
--- a/app/assets/javascripts/app/views/generic/searchable_select.jst.eco
+++ b/app/assets/javascripts/app/views/generic/searchable_select.jst.eco
@@ -17,7 +17,7 @@
     <span class="searchableSelect-autocomplete-invisible js-autocomplete-invisible"></span>
     <span class="searchableSelect-autocomplete-visible js-autocomplete-visible"></span>
   </div>
-  <%- @Icon('arrow-down', 'dropdown-arrow') %>
+  <% if !@ajax: %><%- @Icon('arrow-down', 'dropdown-arrow') %><% end %>
   <div class="small loading icon"></div>
 </div>
 <ul class="dropdown-menu dropdown-menu-left js-optionsList" role="menu">
diff --git a/app/assets/javascripts/app/views/generic/user_search/input.jst.eco b/app/assets/javascripts/app/views/generic/user_search/input.jst.eco
index 1dbc40fe4..90b300e95 100644
--- a/app/assets/javascripts/app/views/generic/user_search/input.jst.eco
+++ b/app/assets/javascripts/app/views/generic/user_search/input.jst.eco
@@ -4,7 +4,7 @@
     <%- @tokens %>
   <% end %>
   <input name="<%- @attribute.name %>_completion" class="user-select token-input js-userSelect" autocapitalize="off" placeholder="<%- @attribute.placeholder %>" autocomplete="off" role="textbox" aria-autocomplete="list" value="<%= @name %>" aria-haspopup="true">
-  <%- @Icon('arrow-down', 'dropdown-arrow') %>
+  <% if @attribute.disableCreateUser isnt true: %><%- @Icon('arrow-down', 'dropdown-arrow') %><% end %>
 </div>
 
 <div class="dropdown-menu" aria-labelledby="customer_id">