diff --git a/db/migrate/20240904035546_update_salesforce_oauth_provider_uid.rb b/db/migrate/20240904035546_update_salesforce_oauth_provider_uid.rb
new file mode 100644
index 0000000..bd12f43
--- /dev/null
+++ b/db/migrate/20240904035546_update_salesforce_oauth_provider_uid.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class UpdateSalesforceOauthProviderUid < ActiveRecord::Migration[7.1]
+  def up
+    execute <<-SQL.squish
+      UPDATE user_associated_accounts
+      SET provider_uid = REGEXP_REPLACE(provider_uid, '^https://login\\.salesforce\\.com/id/[^/]+/', '')
+      WHERE provider_name = 'salesforce';
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/plugin.rb b/plugin.rb
index 1a76df8..c13fd5b 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -121,7 +121,7 @@ def auth_hash
     super
   end
 
-  uid { raw_info["id"] }
+  uid { raw_info["user_id"] }
 
   info do
     {
diff --git a/spec/models/user_associated_account_provider_uid_spec.rb b/spec/models/user_associated_account_provider_uid_spec.rb
new file mode 100644
index 0000000..1060043
--- /dev/null
+++ b/spec/models/user_associated_account_provider_uid_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative "../../db/migrate/20240904035546_update_salesforce_oauth_provider_uid.rb"
+
+RSpec.describe "UpdateSalesforceOauthProviderUid" do
+  fab!(:user1) { Fabricate(:user) }
+  fab!(:user2) { Fabricate(:user) }
+
+  it "properly updates the uid" do
+    salesforce1 =
+      UserAssociatedAccount.create(
+        user_id: user1.id,
+        provider_uid: "https://login.salesforce.com/id/00D5Y000001cLNoUAM/0055Y00000F77E3QAJ",
+        provider_name: "salesforce",
+      )
+    salesforce2 =
+      UserAssociatedAccount.create(
+        user_id: user2.id,
+        provider_uid: "abcdxyz",
+        provider_name: "salesforce",
+      )
+    not_salesforce =
+      UserAssociatedAccount.create(
+        user_id: user1.id,
+        provider_uid: "https://login.salesforce.com/id/00D5Y000001cLNoUAM/0055Y00000F77E3QAJ",
+        provider_name: "not_salesforce",
+      )
+
+    UpdateSalesforceOauthProviderUid.new.up
+
+    expect(salesforce1.reload.provider_uid).to eq("0055Y00000F77E3QAJ")
+    expect(salesforce2.reload.provider_uid).to eq("abcdxyz")
+    expect(not_salesforce.reload.provider_uid).to eq(
+      "https://login.salesforce.com/id/00D5Y000001cLNoUAM/0055Y00000F77E3QAJ",
+    )
+  end
+end