diff --git a/.rubocop.yml b/.rubocop.yml
index 61353ca26..0302ec1c2 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -18,7 +18,6 @@ Metrics/ClassLength:
     - 'app/builders/messages/facebook/message_builder.rb'
     - 'app/controllers/api/v1/accounts/contacts_controller.rb'
     - 'app/listeners/action_cable_listener.rb'
-    - 'app/models/user.rb'
 RSpec/ExampleLength:
   Max: 25
 Style/Documentation:
diff --git a/db/schema.rb b/db/schema.rb
index a87a31232..8af7df22e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -410,7 +410,7 @@ ActiveRecord::Schema.define(version: 2022_11_16_000514) do
     t.datetime "agent_last_seen_at"
     t.jsonb "additional_attributes", default: {}
     t.bigint "contact_inbox_id"
-    t.uuid "uuid", default: -> { "public.gen_random_uuid()" }, null: false
+    t.uuid "uuid", default: -> { "gen_random_uuid()" }, null: false
     t.string "identifier"
     t.datetime "last_activity_at", default: -> { "CURRENT_TIMESTAMP" }, null: false
     t.bigint "team_id"
@@ -462,7 +462,7 @@ ActiveRecord::Schema.define(version: 2022_11_16_000514) do
     t.text "attribute_description"
     t.jsonb "attribute_values", default: []
     t.index ["account_id"], name: "index_custom_attribute_definitions_on_account_id"
-    t.index ["attribute_key", "attribute_model"], name: "attribute_key_model_index", unique: true
+    t.index ["attribute_key", "attribute_model", "account_id"], name: "attribute_key_model_index", unique: true
   end
 
   create_table "custom_filters", force: :cascade do |t|