diff --git a/src/modules/Elsa.Identity/Endpoints/Applications/Create/Endpoint.cs b/src/modules/Elsa.Identity/Endpoints/Applications/Create/Endpoint.cs
index a296bc288..04b7fdb63 100644
--- a/src/modules/Elsa.Identity/Endpoints/Applications/Create/Endpoint.cs
+++ b/src/modules/Elsa.Identity/Endpoints/Applications/Create/Endpoint.cs
@@ -76,8 +76,10 @@ internal class Create : Endpoint<Request, Response>
             clientId,
             clientSecret,
             apiKey,
-            hashedApiKey,
-            hashedClientSecret);
+            hashedApiKey.EncodeSecret(),
+            hashedApiKey.EncodeSalt(),
+            hashedClientSecret.EncodeSecret(),
+            hashedClientSecret.EncodeSalt());
         
         await SendOkAsync(response, cancellationToken);
     }
diff --git a/src/modules/Elsa.Identity/Endpoints/Applications/Create/Models.cs b/src/modules/Elsa.Identity/Endpoints/Applications/Create/Models.cs
index 983ef9a43..435754ddf 100644
--- a/src/modules/Elsa.Identity/Endpoints/Applications/Create/Models.cs
+++ b/src/modules/Elsa.Identity/Endpoints/Applications/Create/Models.cs
@@ -15,6 +15,8 @@ internal record Response(
     string ClientId, 
     string ClientSecret, 
     string ApiKey, 
-    HashedSecret HashedApiKey,
-    HashedSecret HashedClientSecret
+    string HashedApiKey,
+    string HashedApiKeySalt,
+    string HashedClientSecret,
+    string HashedClientSecretSalt
 );
\ No newline at end of file
diff --git a/src/modules/Elsa.Identity/Endpoints/Users/Create/Endpoint.cs b/src/modules/Elsa.Identity/Endpoints/Users/Create/Endpoint.cs
index 4fdad2f4e..020bd0a06 100644
--- a/src/modules/Elsa.Identity/Endpoints/Users/Create/Endpoint.cs
+++ b/src/modules/Elsa.Identity/Endpoints/Users/Create/Endpoint.cs
@@ -62,7 +62,8 @@ internal class Create : ElsaEndpoint<Request, Response>
             user.Name,
             password,
             user.Roles,
-            hashedPassword);
+            hashedPassword.EncodeSecret(),
+            hashedPassword.EncodeSalt());
 
         await SendOkAsync(response, cancellationToken);
     }
diff --git a/src/modules/Elsa.Identity/Endpoints/Users/Create/Models.cs b/src/modules/Elsa.Identity/Endpoints/Users/Create/Models.cs
index 5a6578f4c..f441dde35 100644
--- a/src/modules/Elsa.Identity/Endpoints/Users/Create/Models.cs
+++ b/src/modules/Elsa.Identity/Endpoints/Users/Create/Models.cs
@@ -14,5 +14,6 @@ internal record Response(
     string Name, 
     string Password,
     ICollection<string> Roles,
-    HashedSecret HashedPassword
+    string HashedPassword,
+    string HashedPasswordSalt
 );
\ No newline at end of file