diff --git a/back/src/Kyoo.Core/Controllers/Repositories/UserRepository.cs b/back/src/Kyoo.Core/Controllers/Repositories/UserRepository.cs
index 7cd219f9..fd5f9788 100644
--- a/back/src/Kyoo.Core/Controllers/Repositories/UserRepository.cs
+++ b/back/src/Kyoo.Core/Controllers/Repositories/UserRepository.cs
@@ -99,7 +99,7 @@ public class UserRepository(
 			from
 				users as u
 			where
-				u.external_id->{provider}->>'id' = {id}
+				u.external_id->{provider}->>'Id' = {id}
 			""",
 			new() { ["u"] = typeof(User) },
 			(items) => (items[0] as User)!,
diff --git a/back/src/Kyoo.Postgresql/PostgresModule.cs b/back/src/Kyoo.Postgresql/PostgresModule.cs
index 888de7fa..61f06c04 100644
--- a/back/src/Kyoo.Postgresql/PostgresModule.cs
+++ b/back/src/Kyoo.Postgresql/PostgresModule.cs
@@ -97,6 +97,14 @@ namespace Kyoo.Postgresql
 				typeof(Dictionary<string, MetadataId>),
 				new JsonTypeHandler<Dictionary<string, MetadataId>>()
 			);
+			SqlMapper.AddTypeHandler(
+				typeof(Dictionary<string, string>),
+				new JsonTypeHandler<Dictionary<string, string>>()
+			);
+			SqlMapper.AddTypeHandler(
+				typeof(Dictionary<string, ExternalToken>),
+				new JsonTypeHandler<Dictionary<string, ExternalToken>>()
+			);
 			SqlMapper.AddTypeHandler(typeof(List<string>), new ListTypeHandler<string>());
 			SqlMapper.AddTypeHandler(typeof(List<Genre>), new ListTypeHandler<Genre>());
 			SqlMapper.AddTypeHandler(typeof(Wrapper), new Wrapper.Handler());