diff --git a/src/Artemis.Core/Models/Profile/ProfileCategory.cs b/src/Artemis.Core/Models/Profile/ProfileCategory.cs
index 1a5c6f269..19f0398a2 100644
--- a/src/Artemis.Core/Models/Profile/ProfileCategory.cs
+++ b/src/Artemis.Core/Models/Profile/ProfileCategory.cs
@@ -167,7 +167,7 @@ public void Load()
         IsSuspended = Entity.IsSuspended;
         Order = Entity.Order;
 
-        ProfileConfigurations = new ReadOnlyCollection<ProfileConfiguration>(Entity.ProfileConfigurations.Select(pc => new ProfileConfiguration(this, pc)).ToList());
+        ProfileConfigurations = new ReadOnlyCollection<ProfileConfiguration>(Entity.ProfileConfigurations.Select(pc => new ProfileConfiguration(this, pc)).OrderBy(pc => pc.Order).ToList());
     }
 
     /// <inheritdoc />
@@ -180,7 +180,10 @@ public void Save()
         
         Entity.ProfileConfigurations.Clear();
         foreach (ProfileConfiguration profileConfiguration in ProfileConfigurations)
+        {
+            profileConfiguration.Save();
             Entity.ProfileConfigurations.Add(profileConfiguration.Entity);
+        }
     }
 
     #endregion