diff --git a/app/controllers/admin/contacts_controller.rb b/app/controllers/admin/contacts_controller.rb
index c07222814..66532d88b 100644
--- a/app/controllers/admin/contacts_controller.rb
+++ b/app/controllers/admin/contacts_controller.rb
@@ -9,8 +9,7 @@ class Admin::ContactsController < ApplicationController
 
   def new
     @contact = Contact.new
-    @contact.build_local_address
-    @contact.build_international_address
+    @contact.build_address
   end
 
   def create
@@ -56,8 +55,7 @@ class Admin::ContactsController < ApplicationController
   end
 
   def contact_params
-    params.require(:contact).permit( :email, :phone, :fax, :ident_type, :ident, :auth_info,
-                                    local_address_attributes: [:city, :street, :zip, :street2, :street3, :name, :org_name, :country_id],
-                                    international_address_attributes: [:city, :street, :zip, :street2, :street3, :name, :org_name, :country_id])
+    params.require(:contact).permit( :email, :phone, :fax, :ident_type, :ident, :auth_info, :name, :org_name,
+                                    address_attributes: [:city, :street, :zip, :street2, :street3, :country_id])
   end
 end
diff --git a/app/views/admin/contacts/_form.haml b/app/views/admin/contacts/_form.haml
index a3285a42c..0a7ed1622 100644
--- a/app/views/admin/contacts/_form.haml
+++ b/app/views/admin/contacts/_form.haml
@@ -8,16 +8,19 @@
 
   .row
     .col-md-6.text-left
+      %h3
+        Contact
       .form-group
+        = f.label :name
+        = f.text_field(:name, class: 'form-control')
         = f.label :email
         = f.text_field(:email, class: 'form-control')
         = f.label :phone
         = f.text_field(:phone, class: 'form-control')
         = f.label :fax
         = f.text_field(:fax, class: 'form-control')
-
-    .col-md-6.text-left
-      .form-group
+        = f.label :org_name
+        = f.text_field(:org_name, class: 'form-control')
         = f.label :ident_type
         = f.select :ident_type, options_for_select(Contact::IDENT_TYPES, @contact.ident_type), {}, {class: 'form-control'}
         = f.label :ident
@@ -25,18 +28,11 @@
         = f.label :auth_info
         = f.text_field(:auth_info, class: 'form-control')
 
-  %hr
-  .row
     .col-md-6.text-left
       %h3
-        International Address
+        Address
       .form-group
-        = f.fields_for :international_address do |ia|
-          = ia.label :name
-          = ia.text_field(:name, class: 'form-control')
-          = ia.label :org_name
-          = ia.text_field(:org_name, class: 'form-control')
-
+        = f.fields_for :address do |ia|
           = ia.label :country_id, t(:country)
           = ia.collection_select :country_id, Country.all, :id, :name,{}, { class: 'form-control' }
 
@@ -50,28 +46,7 @@
           = ia.text_field(:street2, class: 'form-control')
 
 
-    .col-md-6.text-left
-      %h3
-        Local Address
-      = f.fields_for :local_address do |ia|
-        = ia.label :name
-        = ia.text_field(:name, class: 'form-control')
-
-        = ia.label :country_id, t(:country)
-        = ia.collection_select :country_id, Country.all, :id, :name,{}, { class: 'form-control' }
-
-        = ia.label :org_name
-        = ia.text_field(:org_name, class: 'form-control')
-
-        = ia.label :city
-        = ia.text_field(:city, class: 'form-control')
-        = ia.label :street
-        = ia.text_field(:street, class: 'form-control')
-        = ia.label :street2
-        = ia.text_field(:street2, class: 'form-control')
-        = ia.label :street3
-        = ia.text_field(:street2, class: 'form-control')
-
+  %hr
   .row
     .col-md-12.text-right
       = button_tag(t('shared.save'), class: 'btn btn-primary')
diff --git a/app/views/admin/contacts/index.haml b/app/views/admin/contacts/index.haml
index 07f3d2c38..eceef87ee 100644
--- a/app/views/admin/contacts/index.haml
+++ b/app/views/admin/contacts/index.haml
@@ -13,7 +13,7 @@
         %thead
           %tr
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'international_address_name', t('shared.name'))
+              = sort_link(@q, 'name', t('shared.name'))
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'code', t('shared.code'))
             %th{class: 'col-xs-2'}
diff --git a/app/views/admin/contacts/partials/_address.haml b/app/views/admin/contacts/partials/_address.haml
index 498688978..9b6ec320c 100644
--- a/app/views/admin/contacts/partials/_address.haml
+++ b/app/views/admin/contacts/partials/_address.haml
@@ -4,16 +4,24 @@
   .panel-body
     %dl.dl-horizontal
       %dt= t('shared.country')
-      %dd= @contact.address_country
+      %dd= @contact.address.country
 
       %dt= t('shared.city')
-      %dd= @contact.address_city
+      %dd= @contact.address.city
 
       %dt= t('shared.street')
-      %dd= @contact.address_street
+      %dd= @contact.address.street
+
+      - if @contact.address.street2
+        %dt= t('shared.street')
+        %dd= @contact.address.street2
+
+      - if @contact.address.street3
+        %dt= t('shared.street')
+        %dd= @contact.address.street3
+
+
 
       %dt= t('shared.zip')
-      %dd= @contact.address_zip
+      %dd= @contact.address.zip
 
-      %dt= t('shared.org_name')
-      %dd= @contact.address_org_name
diff --git a/app/views/admin/contacts/partials/_general.haml b/app/views/admin/contacts/partials/_general.haml
index 68de2c076..df6e988a7 100644
--- a/app/views/admin/contacts/partials/_general.haml
+++ b/app/views/admin/contacts/partials/_general.haml
@@ -6,6 +6,9 @@
       %dt= t('shared.name')
       %dd= @contact.name
 
+      %dt= t('shared.org_name')
+      %dd= @contact.org_name
+
       %dt= t('shared.code')
       %dd= @contact.code
 
diff --git a/app/views/admin/contacts/partials/_search.haml b/app/views/admin/contacts/partials/_search.haml
index 645b568f0..3da4ffcde 100644
--- a/app/views/admin/contacts/partials/_search.haml
+++ b/app/views/admin/contacts/partials/_search.haml
@@ -1,5 +1,5 @@
 = search_form_for [:admin, @q] do |f|
-  = f.search_field :international_address_name_cont
+  = f.search_field :name_cont
   = f.submit do
     %span.glyphicon.glyphicon-search
 
diff --git a/app/views/admin/domains/index.haml b/app/views/admin/domains/index.haml
index d2991e252..b16e1d061 100644
--- a/app/views/admin/domains/index.haml
+++ b/app/views/admin/domains/index.haml
@@ -16,7 +16,7 @@
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'registrar_name', t('shared.registrar'))
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'owner_contact_international_address_name', t('shared.owner'))
+              = sort_link(@q, 'owner_contact_name', t('shared.owner'))
             %th{class: 'col-xs-1'}
               = sort_link(@q, 'valid_to', t('shared.valid_to'))
             %th{class: 'col-xs-1'}
diff --git a/app/views/client/domains/index.haml b/app/views/client/domains/index.haml
index aded1346f..384d1e727 100644
--- a/app/views/client/domains/index.haml
+++ b/app/views/client/domains/index.haml
@@ -11,7 +11,7 @@
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'name')
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'owner_contact_international_address_name', t('shared.owner'))
+              = sort_link(@q, 'owner_contact_name', t('shared.owner'))
             %th{class: 'col-xs-1'}
               = sort_link(@q, 'valid_to', t('shared.valid_to'))
             %th{class: 'col-xs-1'}