diff --git a/source/Extensibility.Authentication/Extensibility.Authentication.csproj b/source/Extensibility.Authentication/Extensibility.Authentication.csproj
index 2a97cf5..6a5b066 100644
--- a/source/Extensibility.Authentication/Extensibility.Authentication.csproj
+++ b/source/Extensibility.Authentication/Extensibility.Authentication.csproj
@@ -14,7 +14,7 @@
     <LangVersion>default</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Octopus.Data" Version="6.0.0" />
+    <PackageReference Include="Octopus.Data" Version="7.0.0" />
     <PackageReference Include="Octopus.Server.Extensibility" Version="14.0.1" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/source/Extensibility.Authentication/HostServices/IUpdateableUserStore.cs b/source/Extensibility.Authentication/HostServices/IUpdateableUserStore.cs
index 4f17955..d8c415d 100644
--- a/source/Extensibility.Authentication/HostServices/IUpdateableUserStore.cs
+++ b/source/Extensibility.Authentication/HostServices/IUpdateableUserStore.cs
@@ -4,6 +4,7 @@
 using Octopus.Data;
 using Octopus.Data.Model.User;
 using Octopus.Data.Storage.User;
+using Octopus.Server.MessageContracts.Features.Users;
 
 namespace Octopus.Server.Extensibility.Authentication.HostServices
 {
@@ -20,16 +21,16 @@ IResult<IUser> Create(
             bool isService = false,
             string? password = null);
 
-        void EnableUser(string userId);
+        void EnableUser(UserId userId);
 
-        void DisableUser(string userId);
+        void DisableUser(UserId userId);
 
-        IUser AddIdentity(string userId, Identity identity, CancellationToken cancellationToken);
+        IUser AddIdentity(UserId userId, Identity identity, CancellationToken cancellationToken);
 
-        IUser UpdateIdentity(string userId, Identity identity, CancellationToken cancellationToken);
+        IUser UpdateIdentity(UserId userId, Identity identity, CancellationToken cancellationToken);
 
-        void ClearSecurityGroupIds(string provider, string userId);
+        void ClearSecurityGroupIds(string provider, UserId userId);
 
-        void SetSecurityGroupIds(string provider, string userId, IEnumerable<string> ids, DateTimeOffset updated);
+        void SetSecurityGroupIds(string provider, UserId userId, IEnumerable<string> ids, DateTimeOffset updated);
     }
 }
\ No newline at end of file