diff --git a/MareSynchronosServer/MareSynchronosServer/Discord/DiscordBot.cs b/MareSynchronosServer/MareSynchronosServer/Discord/DiscordBot.cs
index fb92a46..47dbf53 100644
--- a/MareSynchronosServer/MareSynchronosServer/Discord/DiscordBot.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Discord/DiscordBot.cs
@@ -26,6 +26,7 @@ namespace MareSynchronosServer.Discord
         private readonly IServiceProvider services;
         private readonly IConfiguration configuration;
         private readonly ILogger<DiscordBot> logger;
+        private readonly Random random;
         private string authToken = string.Empty;
         DiscordSocketClient discordClient;
         ConcurrentDictionary<ulong, string> DiscordLodestoneMapping = new();
@@ -39,6 +40,7 @@ namespace MareSynchronosServer.Discord
             this.configuration = configuration;
             this.logger = logger;
 
+            random = new();
             authToken = configuration.GetValue<string>("DiscordBotToken");
 
             discordClient = new(new DiscordSocketConfig()
@@ -131,8 +133,7 @@ namespace MareSynchronosServer.Discord
             var lodestoneAuth = db.LodeStoneAuth.SingleOrDefault(u => u.DiscordId == id);
             if (lodestoneAuth != null && DiscordLodestoneMapping.ContainsKey(id))
             {
-                Random rand = new();
-                var randomServer = LodestoneServers[rand.Next(LodestoneServers.Length)];
+                var randomServer = LodestoneServers[random.Next(LodestoneServers.Length)];
                 var response = await req.GetAsync($"https://{randomServer}.finalfantasyxiv.com/lodestone/character/{DiscordLodestoneMapping[id]}");
                 if (response.IsSuccessStatusCode)
                 {
diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
index b06f316..b0efac7 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
@@ -133,9 +133,7 @@ namespace MareSynchronosServer.Hubs
                 allowableChars = @"ABCDEFGHJKLMNPQRSTUVWXYZ0123456789";
 
             // Generate random data
-            var rnd = new byte[length];
-            using (var rng = new RNGCryptoServiceProvider())
-                rng.GetBytes(rnd);
+            var rnd = RandomNumberGenerator.GetBytes(length);
 
             // Generate the output string
             var allowable = allowableChars.ToCharArray();