diff --git a/src/Umbraco.Infrastructure/Persistence/Dtos/ExternalLoginDto.cs b/src/Umbraco.Infrastructure/Persistence/Dtos/ExternalLoginDto.cs
index 3fc65b28a5..95ff357abe 100644
--- a/src/Umbraco.Infrastructure/Persistence/Dtos/ExternalLoginDto.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Dtos/ExternalLoginDto.cs
@@ -25,9 +25,9 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Dtos
         public int UserId { get; set; }
 
         [Column("loginProvider")]
-        [Length(4000)] // TODO: This value seems WAY too high, this is just a name
+        [Length(400)]
         [NullSetting(NullSetting = NullSettings.NotNull)]
-        [Index(IndexTypes.UniqueNonClustered, Name = "IX_" + TableName + "_LoginProvider")]
+        [Index(IndexTypes.UniqueNonClustered, ForColumns = "loginProvider,userId", Name = "IX_" + TableName + "_LoginProvider")]
         public string LoginProvider { get; set; }
 
         [Column("providerKey")]