diff --git a/Libraries/SPTarkov.Server.Core/Helpers/PrestigeHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/PrestigeHelper.cs
index 87e406fc..ff1fafd0 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/PrestigeHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/PrestigeHelper.cs
@@ -71,7 +71,7 @@ public class PrestigeHelper(
             }
         }
 
-        var indexOfPrestigeObtained = Math.Min(prestige.PrestigeLevel.Value - 1, 1); // Index starts at 0
+        var indexOfPrestigeObtained = Math.Min((prestige.PrestigeLevel ?? 1) - 1, 1); // Index starts at 0
 
         // Add "Prestigious" achievement
         if (!newProfile.CharacterData.PmcData.Achievements.ContainsKey("676091c0f457869a94017a23"))
diff --git a/Libraries/SPTarkov.Server.Core/Services/CreateProfileService.cs b/Libraries/SPTarkov.Server.Core/Services/CreateProfileService.cs
index eb602308..1b855a78 100644
--- a/Libraries/SPTarkov.Server.Core/Services/CreateProfileService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/CreateProfileService.cs
@@ -133,6 +133,8 @@ public class CreateProfileService(
 
         profileFixerService.CheckForAndFixPmcProfileIssues(profileDetails.CharacterData.PmcData);
 
+        saveServer.AddProfile(profileDetails);
+
         if (profileDetails.CharacterData.PmcData.Achievements.Count > 0)
         {
             var achievementsDb = databaseService.GetTemplates().Achievements;
@@ -185,8 +187,6 @@ public class CreateProfileService(
             prestigeHelper.ProcessPendingPrestige(account, profileDetails, pendingPrestige);
         }
 
-        saveServer.AddProfile(profileDetails);
-
         if (profileTemplateClone.Trader.SetQuestsAvailableForStart ?? false)
         {
             questHelper.AddAllQuestsToProfile(