diff --git a/app/views/client/domains/_form.haml b/app/views/client/domains/_form.haml
index 47a96fd3b..fea000c51 100644
--- a/app/views/client/domains/_form.haml
+++ b/app/views/client/domains/_form.haml
@@ -33,13 +33,4 @@
     $('#tabs a:first').tab('show')
   })
 
-  $("#domain_contacts").nestedAttributes({
-    bindAddTo: $(".add-domain-contact"),
-    afterAdd: function(item) {
-      item.find('.errors').html('');
-      item.find('.js-contact-id').val('')
-      Autocomplete.bindClientContactSearch();
-    }
-  });
-
   Autocomplete.bindClientContactSearch();
diff --git a/app/views/client/domains/form_partials/_contacts.haml b/app/views/client/domains/form_partials/_contacts.haml
index da031c9cc..2290c49ff 100644
--- a/app/views/client/domains/form_partials/_contacts.haml
+++ b/app/views/client/domains/form_partials/_contacts.haml
@@ -12,11 +12,23 @@
           - if contact_fields.object.errors.any?
             %hr
         .form-group
-          = contact_fields.label :contact_type, t('shared.contact'), class: 'col-md-2 control-label'
-          .col-md-5
+          = contact_fields.label :contact_type, class: 'col-md-2 control-label'
+          .col-md-10
             = contact_fields.select :contact_type, options_for_select(DomainContact::TYPES, contact_fields.object.contact_type), {}, {class: 'form-control'}
-          .col-md-5.has-feedback.js-typeahead-container
+
+        .form-group
+          = contact_fields.label :value_typeahead, t('shared.contact'), class: 'col-md-2 control-label'
+          .col-md-10.has-feedback.js-typeahead-container
             = contact_fields.text_field(:value_typeahead, class: 'form-control js-contact-typeahead', placeholder: t('shared.contact_code'), autocomplete: 'off')
             %span.glyphicon.glyphicon-ok.form-control-feedback.js-typeahead-ok.hidden
             %span.glyphicon.glyphicon-remove.form-control-feedback.js-typeahead-remove
             = contact_fields.hidden_field(:contact_id, class: 'js-contact-id')
+:javascript
+  $("#domain-contacts").nestedAttributes({
+    bindAddTo: $(".add-domain-contact"),
+    afterAdd: function(item) {
+      item.find('.errors').html('');
+      item.find('.js-contact-id').val('')
+      Autocomplete.bindClientContactSearch();
+    }
+  });