diff --git a/src/AliasVault.Client/Services/CredentialService.cs b/src/AliasVault.Client/Services/CredentialService.cs
index 7cfac76cd..b7b755794 100644
--- a/src/AliasVault.Client/Services/CredentialService.cs
+++ b/src/AliasVault.Client/Services/CredentialService.cs
@@ -27,6 +27,17 @@ using Identity = AliasGenerators.Identity.Models.Identity;
 /// </summary>
 public class CredentialService(HttpClient httpClient, DbService dbService, Config config)
 {
+    /// <summary>
+    /// Generates a random password for a credential.
+    /// </summary>
+    /// <returns>Random password.</returns>
+    public static string GenerateRandomPassword()
+    {
+        // Generate a random password using a IPasswordGenerator implementation.
+        var passwordGenerator = new SpamOkPasswordGenerator();
+        return passwordGenerator.GenerateRandomPassword();
+    }
+
     /// <summary>
     /// Generates a random identity for a credential.
     /// </summary>
@@ -81,17 +92,6 @@ public class CredentialService(HttpClient httpClient, DbService dbService, Confi
         return domainToUse;
     }
 
-    /// <summary>
-    /// Generates a random password for a credential.
-    /// </summary>
-    /// <returns>Random password.</returns>
-    public string GenerateRandomPassword()
-    {
-        // Generate a random password using a IPasswordGenerator implementation.
-        IPasswordGenerator passwordGenerator = new SpamOkPasswordGenerator();
-        return passwordGenerator.GenerateRandomPassword();
-    }
-
     /// <summary>
     /// Generate random identity by calling the IdentityGenerator API.
     /// </summary>
diff --git a/src/AliasVault.Client/Services/KeyboardShortcutService.cs b/src/AliasVault.Client/Services/KeyboardShortcutService.cs
index 33ccfbb6a..4fead2f27 100644
--- a/src/AliasVault.Client/Services/KeyboardShortcutService.cs
+++ b/src/AliasVault.Client/Services/KeyboardShortcutService.cs
@@ -17,7 +17,6 @@ using Microsoft.JSInterop;
 /// </summary>
 public class KeyboardShortcutService : IAsyncDisposable
 {
-    private readonly IJSRuntime _jsRuntime;
     private readonly DotNetObjectReference<CallbackWrapper> _dotNetHelper;
     private readonly NavigationManager _navigationManager;
     private readonly Lazy<Task<IJSObjectReference>> moduleTask;
@@ -29,7 +28,6 @@ public class KeyboardShortcutService : IAsyncDisposable
     /// <param name="navigationManager">NavigationManager instance.</param>
     public KeyboardShortcutService(IJSRuntime jsRuntime, NavigationManager navigationManager)
     {
-        _jsRuntime = jsRuntime;
         _dotNetHelper = DotNetObjectReference.Create(new CallbackWrapper());
         _navigationManager = navigationManager;