diff --git a/app/models/invoicing_profile.rb b/app/models/invoicing_profile.rb
index 27ede1620..0edd37eca 100644
--- a/app/models/invoicing_profile.rb
+++ b/app/models/invoicing_profile.rb
@@ -1,5 +1,5 @@
 class InvoicingProfile < ActiveRecord::Base
   belongs_to :user
-  belongs_to :address
-  belongs_to :organization
+  has_one :address, as: :placeable, dependent: :destroy
+  has_one :organization, dependent: :destroy
 end
diff --git a/app/models/organization.rb b/app/models/organization.rb
index e227ace37..1c21f4fed 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -1,5 +1,6 @@
 class Organization < ActiveRecord::Base
   belongs_to :profile
+  belongs_to :invoicing_profile
   has_one :address, as: :placeable, dependent: :destroy
   accepts_nested_attributes_for :address, allow_destroy: true
 
diff --git a/db/migrate/20190521122429_create_invoicing_profiles.rb b/db/migrate/20190521122429_create_invoicing_profiles.rb
index eff7a3de5..e90e9ec79 100644
--- a/db/migrate/20190521122429_create_invoicing_profiles.rb
+++ b/db/migrate/20190521122429_create_invoicing_profiles.rb
@@ -4,10 +4,10 @@ class CreateInvoicingProfiles < ActiveRecord::Migration
       t.references :user, index: true, foreign_key: true
       t.string :first_name
       t.string :last_name
-      t.references :address, index: true, foreign_key: true
-      t.references :organization, index: true, foreign_key: true
 
       t.timestamps null: false
     end
+
+    add_reference :organizations, :invoicing_profile, index: true, foreign_key: true
   end
 end
diff --git a/db/migrate/20190521124609_migrate_profile_to_invoicing_profile.rb b/db/migrate/20190521124609_migrate_profile_to_invoicing_profile.rb
index 72b9cff50..f7a0c2309 100644
--- a/db/migrate/20190521124609_migrate_profile_to_invoicing_profile.rb
+++ b/db/migrate/20190521124609_migrate_profile_to_invoicing_profile.rb
@@ -1,12 +1,32 @@
 class MigrateProfileToInvoicingProfile < ActiveRecord::Migration
   def up
     Profile.all.each do |p|
-      InvoicingProfile.create!(
+      ip = InvoicingProfile.create!(
         user: p.user,
         first_name: p.first_name,
-        last_name: p.last_name,
-        address: p.address,
-        organization: p.organization
+        last_name: p.last_name
+      )
+      p.address&.update_attributes(
+        placeable: ip
+      )
+      p.organization&.update_attributes(
+        invoicing_profile_id: ip.id
+      )
+    end
+  end
+
+  def down
+    InvoicingProfile.all.each do |ip|
+      profile = ip.user.profile
+      profile.update_attributes(
+        first_name: ip.first_name,
+        last_name: ip.last_name,
+      )
+      ip.address&.update_attributes(
+        placeable: profile
+      )
+      ip.organization&.update_attributes(
+        profile_id: profile.id
       )
     end
   end
diff --git a/db/schema.rb b/db/schema.rb
index 3f7243bd1..9ecec388c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -44,14 +44,14 @@ ActiveRecord::Schema.define(version: 20190521124609) do
   end
 
   create_table "addresses", force: :cascade do |t|
-    t.string   "address"
-    t.string   "street_number"
-    t.string   "route"
-    t.string   "locality"
-    t.string   "country"
-    t.string   "postal_code"
+    t.string   "address",        limit: 255
+    t.string   "street_number",  limit: 255
+    t.string   "route",          limit: 255
+    t.string   "locality",       limit: 255
+    t.string   "country",        limit: 255
+    t.string   "postal_code",    limit: 255
     t.integer  "placeable_id"
-    t.string   "placeable_type"
+    t.string   "placeable_type", limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -67,9 +67,9 @@ ActiveRecord::Schema.define(version: 20190521124609) do
 
   create_table "assets", force: :cascade do |t|
     t.integer  "viewable_id"
-    t.string   "viewable_type"
-    t.string   "attachment"
-    t.string   "type"
+    t.string   "viewable_type", limit: 255
+    t.string   "attachment",    limit: 255
+    t.string   "type",          limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -86,12 +86,12 @@ ActiveRecord::Schema.define(version: 20190521124609) do
   create_table "availabilities", force: :cascade do |t|
     t.datetime "start_at"
     t.datetime "end_at"
-    t.string   "available_type"
+    t.string   "available_type",  limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "nb_total_places"
-    t.boolean  "destroying",      default: false
-    t.boolean  "lock",            default: false
+    t.boolean  "destroying",                  default: false
+    t.boolean  "lock",                        default: false
   end
 
   create_table "availability_tags", force: :cascade do |t|
@@ -105,7 +105,7 @@ ActiveRecord::Schema.define(version: 20190521124609) do
   add_index "availability_tags", ["tag_id"], name: "index_availability_tags_on_tag_id", using: :btree
 
   create_table "categories", force: :cascade do |t|
-    t.string   "name"
+    t.string   "name",       limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "slug"
@@ -114,7 +114,7 @@ ActiveRecord::Schema.define(version: 20190521124609) do
   add_index "categories", ["slug"], name: "index_categories_on_slug", unique: true, using: :btree
 
   create_table "components", force: :cascade do |t|
-    t.string "name", null: false
+    t.string "name", limit: 255, null: false
   end
 
   create_table "coupons", force: :cascade do |t|
@@ -132,7 +132,7 @@ ActiveRecord::Schema.define(version: 20190521124609) do
 
   create_table "credits", force: :cascade do |t|
     t.integer  "creditable_id"
-    t.string   "creditable_type"
+    t.string   "creditable_type", limit: 255
     t.integer  "plan_id"
     t.integer  "hours"
     t.datetime "created_at"
@@ -173,7 +173,7 @@ ActiveRecord::Schema.define(version: 20190521124609) do
   add_index "event_themes", ["slug"], name: "index_event_themes_on_slug", unique: true, using: :btree
 
   create_table "events", force: :cascade do |t|
-    t.string   "title"
+    t.string   "title",           limit: 255
     t.text     "description"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -211,10 +211,10 @@ ActiveRecord::Schema.define(version: 20190521124609) do
   add_index "exports", ["user_id"], name: "index_exports_on_user_id", using: :btree
 
   create_table "friendly_id_slugs", force: :cascade do |t|
-    t.string   "slug",                      null: false
-    t.integer  "sluggable_id",              null: false
+    t.string   "slug",           limit: 255, null: false
+    t.integer  "sluggable_id",               null: false
     t.string   "sluggable_type", limit: 50
-    t.string   "scope"
+    t.string   "scope",          limit: 255
     t.datetime "created_at"
   end
 
@@ -224,10 +224,10 @@ ActiveRecord::Schema.define(version: 20190521124609) do
   add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type", using: :btree
 
   create_table "groups", force: :cascade do |t|
-    t.string   "name"
+    t.string   "name",       limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "slug"
+    t.string   "slug",       limit: 255
     t.boolean  "disabled"
   end
 
@@ -247,7 +247,7 @@ ActiveRecord::Schema.define(version: 20190521124609) do
 
   create_table "invoice_items", force: :cascade do |t|
     t.integer  "invoice_id"
-    t.string   "stp_invoice_item_id"
+    t.string   "stp_invoice_item_id", limit: 255
     t.integer  "amount"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -261,17 +261,17 @@ ActiveRecord::Schema.define(version: 20190521124609) do
 
   create_table "invoices", force: :cascade do |t|
     t.integer  "invoiced_id"
-    t.string   "invoiced_type"
-    t.string   "stp_invoice_id"
+    t.string   "invoiced_type",          limit: 255
+    t.string   "stp_invoice_id",         limit: 255
     t.integer  "total"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "user_id"
-    t.string   "reference"
-    t.string   "avoir_mode"
+    t.string   "reference",              limit: 255
+    t.string   "avoir_mode",             limit: 255
     t.datetime "avoir_date"
     t.integer  "invoice_id"
-    t.string   "type"
+    t.string   "type",                   limit: 255
     t.boolean  "subscription_to_expire"
     t.text     "description"
     t.integer  "wallet_amount"
@@ -291,28 +291,24 @@ ActiveRecord::Schema.define(version: 20190521124609) do
     t.integer  "user_id"
     t.string   "first_name"
     t.string   "last_name"
-    t.integer  "address_id"
-    t.integer  "organization_id"
-    t.datetime "created_at",      null: false
-    t.datetime "updated_at",      null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  add_index "invoicing_profiles", ["address_id"], name: "index_invoicing_profiles_on_address_id", using: :btree
-  add_index "invoicing_profiles", ["organization_id"], name: "index_invoicing_profiles_on_organization_id", using: :btree
   add_index "invoicing_profiles", ["user_id"], name: "index_invoicing_profiles_on_user_id", using: :btree
 
   create_table "licences", force: :cascade do |t|
-    t.string "name",        null: false
+    t.string "name",        limit: 255, null: false
     t.text   "description"
   end
 
   create_table "machines", force: :cascade do |t|
-    t.string   "name",        null: false
+    t.string   "name",        limit: 255, null: false
     t.text     "description"
     t.text     "spec"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "slug"
+    t.string   "slug",        limit: 255
     t.boolean  "disabled"
   end
 
@@ -329,14 +325,14 @@ ActiveRecord::Schema.define(version: 20190521124609) do
   create_table "notifications", force: :cascade do |t|
     t.integer  "receiver_id"
     t.integer  "attached_object_id"
-    t.string   "attached_object_type"
+    t.string   "attached_object_type", limit: 255
     t.integer  "notification_type_id"
-    t.boolean  "is_read",              default: false
+    t.boolean  "is_read",                          default: false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "receiver_type"
-    t.boolean  "is_send",              default: false
-    t.jsonb    "meta_data",            default: {}
+    t.boolean  "is_send",                          default: false
+    t.jsonb    "meta_data",                        default: {}
   end
 
   add_index "notifications", ["notification_type_id"], name: "index_notifications_on_notification_type_id", using: :btree
@@ -397,28 +393,30 @@ ActiveRecord::Schema.define(version: 20190521124609) do
 
   create_table "organizations", force: :cascade do |t|
     t.string   "name"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at",           null: false
+    t.datetime "updated_at",           null: false
     t.integer  "profile_id"
+    t.integer  "invoicing_profile_id"
   end
 
+  add_index "organizations", ["invoicing_profile_id"], name: "index_organizations_on_invoicing_profile_id", using: :btree
   add_index "organizations", ["profile_id"], name: "index_organizations_on_profile_id", using: :btree
 
   create_table "plans", force: :cascade do |t|
-    t.string   "name"
+    t.string   "name",               limit: 255
     t.integer  "amount"
-    t.string   "interval"
+    t.string   "interval",           limit: 255
     t.integer  "group_id"
-    t.string   "stp_plan_id"
+    t.string   "stp_plan_id",        limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "training_credit_nb", default: 0
-    t.boolean  "is_rolling",         default: true
+    t.integer  "training_credit_nb",             default: 0
+    t.boolean  "is_rolling",                     default: true
     t.text     "description"
     t.string   "type"
     t.string   "base_name"
-    t.integer  "ui_weight",          default: 0
-    t.integer  "interval_count",     default: 1
+    t.integer  "ui_weight",                      default: 0
+    t.integer  "interval_count",                 default: 1
     t.string   "slug"
     t.boolean  "disabled"
   end
@@ -448,11 +446,11 @@ ActiveRecord::Schema.define(version: 20190521124609) do
 
   create_table "profiles", force: :cascade do |t|
     t.integer  "user_id"
-    t.string   "first_name"
-    t.string   "last_name"
+    t.string   "first_name",        limit: 255
+    t.string   "last_name",         limit: 255
     t.boolean  "gender"
     t.date     "birthday"
-    t.string   "phone"
+    t.string   "phone",             limit: 255
     t.text     "interest"
     t.text     "software_mastered"
     t.datetime "created_at"
@@ -482,7 +480,7 @@ ActiveRecord::Schema.define(version: 20190521124609) do
     t.integer  "project_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "title"
+    t.string   "title",       limit: 255
     t.integer  "step_nb"
   end
 
@@ -493,27 +491,27 @@ ActiveRecord::Schema.define(version: 20190521124609) do
     t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "is_valid",    default: false
-    t.string   "valid_token"
+    t.boolean  "is_valid",                default: false
+    t.string   "valid_token", limit: 255
   end
 
   add_index "project_users", ["project_id"], name: "index_project_users_on_project_id", using: :btree
   add_index "project_users", ["user_id"], name: "index_project_users_on_user_id", using: :btree
 
   create_table "projects", force: :cascade do |t|
-    t.string   "name"
+    t.string   "name",         limit: 255
     t.text     "description"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "author_id"
     t.text     "tags"
     t.integer  "licence_id"
-    t.string   "state"
-    t.string   "slug"
+    t.string   "state",        limit: 255
+    t.string   "slug",         limit: 255
     t.datetime "published_at"
   end
 
-  add_index "projects", ["slug"], name: "index_projects_on_slug", unique: true, using: :btree
+  add_index "projects", ["slug"], name: "index_projects_on_slug", using: :btree
 
   create_table "projects_components", force: :cascade do |t|
     t.integer "project_id"
@@ -553,19 +551,19 @@ ActiveRecord::Schema.define(version: 20190521124609) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "reservable_id"
-    t.string   "reservable_type"
-    t.string   "stp_invoice_id"
+    t.string   "reservable_type",   limit: 255
+    t.string   "stp_invoice_id",    limit: 255
     t.integer  "nb_reserve_places"
   end
 
-  add_index "reservations", ["reservable_type", "reservable_id"], name: "index_reservations_on_reservable_type_and_reservable_id", using: :btree
+  add_index "reservations", ["reservable_id", "reservable_type"], name: "index_reservations_on_reservable_id_and_reservable_type", using: :btree
   add_index "reservations", ["stp_invoice_id"], name: "index_reservations_on_stp_invoice_id", using: :btree
   add_index "reservations", ["user_id"], name: "index_reservations_on_user_id", using: :btree
 
   create_table "roles", force: :cascade do |t|
-    t.string   "name"
+    t.string   "name",          limit: 255
     t.integer  "resource_id"
-    t.string   "resource_type"
+    t.string   "resource_type", limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -639,18 +637,18 @@ ActiveRecord::Schema.define(version: 20190521124609) do
 
   create_table "statistic_fields", force: :cascade do |t|
     t.integer  "statistic_index_id"
-    t.string   "key"
-    t.string   "label"
+    t.string   "key",                limit: 255
+    t.string   "label",              limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "data_type"
+    t.string   "data_type",          limit: 255
   end
 
   add_index "statistic_fields", ["statistic_index_id"], name: "index_statistic_fields_on_statistic_index_id", using: :btree
 
   create_table "statistic_graphs", force: :cascade do |t|
     t.integer  "statistic_index_id"
-    t.string   "chart_type"
+    t.string   "chart_type",         limit: 255
     t.integer  "limit"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -659,17 +657,17 @@ ActiveRecord::Schema.define(version: 20190521124609) do
   add_index "statistic_graphs", ["statistic_index_id"], name: "index_statistic_graphs_on_statistic_index_id", using: :btree
 
   create_table "statistic_indices", force: :cascade do |t|
-    t.string   "es_type_key"
-    t.string   "label"
+    t.string   "es_type_key", limit: 255
+    t.string   "label",       limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "table",       default: true
-    t.boolean  "ca",          default: true
+    t.boolean  "table",                   default: true
+    t.boolean  "ca",                      default: true
   end
 
   create_table "statistic_sub_types", force: :cascade do |t|
-    t.string   "key"
-    t.string   "label"
+    t.string   "key",        limit: 255
+    t.string   "label",      limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -686,8 +684,8 @@ ActiveRecord::Schema.define(version: 20190521124609) do
 
   create_table "statistic_types", force: :cascade do |t|
     t.integer  "statistic_index_id"
-    t.string   "key"
-    t.string   "label"
+    t.string   "key",                limit: 255
+    t.string   "label",              limit: 255
     t.boolean  "graph"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -705,7 +703,7 @@ ActiveRecord::Schema.define(version: 20190521124609) do
   create_table "subscriptions", force: :cascade do |t|
     t.integer  "plan_id"
     t.integer  "user_id"
-    t.string   "stp_subscription_id"
+    t.string   "stp_subscription_id", limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "expiration_date"
@@ -724,7 +722,7 @@ ActiveRecord::Schema.define(version: 20190521124609) do
   add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
 
   create_table "themes", force: :cascade do |t|
-    t.string "name", null: false
+    t.string "name", limit: 255, null: false
   end
 
   create_table "tickets", force: :cascade do |t|
@@ -739,13 +737,13 @@ ActiveRecord::Schema.define(version: 20190521124609) do
   add_index "tickets", ["reservation_id"], name: "index_tickets_on_reservation_id", using: :btree
 
   create_table "trainings", force: :cascade do |t|
-    t.string   "name"
+    t.string   "name",            limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "nb_total_places"
-    t.string   "slug"
+    t.string   "slug",            limit: 255
     t.text     "description"
-    t.boolean  "public_page",     default: true
+    t.boolean  "public_page",                 default: true
     t.boolean  "disabled"
   end
 
@@ -801,31 +799,31 @@ ActiveRecord::Schema.define(version: 20190521124609) do
   add_index "user_trainings", ["user_id"], name: "index_user_trainings_on_user_id", using: :btree
 
   create_table "users", force: :cascade do |t|
-    t.string   "email",                  default: "",   null: false
-    t.string   "encrypted_password",     default: "",   null: false
-    t.string   "reset_password_token"
+    t.string   "email",                  limit: 255, default: "",   null: false
+    t.string   "encrypted_password",     limit: 255, default: "",   null: false
+    t.string   "reset_password_token",   limit: 255
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,    null: false
+    t.integer  "sign_in_count",                      default: 0,    null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.string   "confirmation_token"
+    t.string   "current_sign_in_ip",     limit: 255
+    t.string   "last_sign_in_ip",        limit: 255
+    t.string   "confirmation_token",     limit: 255
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string   "unconfirmed_email"
-    t.integer  "failed_attempts",        default: 0,    null: false
-    t.string   "unlock_token"
+    t.string   "unconfirmed_email",      limit: 255
+    t.integer  "failed_attempts",                    default: 0,    null: false
+    t.string   "unlock_token",           limit: 255
     t.datetime "locked_at"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "is_allow_contact",       default: true
+    t.boolean  "is_allow_contact",                   default: true
     t.integer  "group_id"
-    t.string   "stp_customer_id"
-    t.string   "username"
-    t.string   "slug"
-    t.boolean  "is_active",              default: true
+    t.string   "stp_customer_id",        limit: 255
+    t.string   "username",               limit: 255
+    t.string   "slug",                   limit: 255
+    t.boolean  "is_active",                          default: true
     t.string   "provider"
     t.string   "uid"
     t.string   "auth_token"
@@ -900,11 +898,10 @@ ActiveRecord::Schema.define(version: 20190521124609) do
   add_foreign_key "invoices", "coupons"
   add_foreign_key "invoices", "users", column: "operator_id"
   add_foreign_key "invoices", "wallet_transactions"
-  add_foreign_key "invoicing_profiles", "addresses"
-  add_foreign_key "invoicing_profiles", "organizations"
   add_foreign_key "invoicing_profiles", "users"
   add_foreign_key "o_auth2_mappings", "o_auth2_providers"
   add_foreign_key "open_api_calls_count_tracings", "open_api_clients"
+  add_foreign_key "organizations", "invoicing_profiles"
   add_foreign_key "organizations", "profiles"
   add_foreign_key "prices", "groups"
   add_foreign_key "prices", "plans"