Merge branch 'master' into master

1 files changed, 3 insertions, 2 deletions

diff --git a/Jellyfin.Api/Controllers/StartupController.cs b/Jellyfin.Api/Controllers/StartupController.cs
index b3b900ceb..3bb68553d 100644
--- a/Jellyfin.Api/Controllers/StartupController.cs
+++ b/Jellyfin.Api/Controllers/StartupController.cs
@@ -59,6 +59,7 @@ public class StartupController : BaseJellyfinApiController
     {
         return new StartupConfigurationDto
         {
+            ServerName = _config.Configuration.ServerName,
             UICulture = _config.Configuration.UICulture,
             MetadataCountryCode = _config.Configuration.MetadataCountryCode,
             PreferredMetadataLanguage = _config.Configuration.PreferredMetadataLanguage
@@ -75,6 +76,7 @@ public class StartupController : BaseJellyfinApiController
     [ProducesResponseType(StatusCodes.Status204NoContent)]
     public ActionResult UpdateInitialConfiguration([FromBody, Required] StartupConfigurationDto startupConfiguration)
     {
+        _config.Configuration.ServerName = startupConfiguration.ServerName ?? string.Empty;
         _config.Configuration.UICulture = startupConfiguration.UICulture ?? string.Empty;
         _config.Configuration.MetadataCountryCode = startupConfiguration.MetadataCountryCode ?? string.Empty;
         _config.Configuration.PreferredMetadataLanguage = startupConfiguration.PreferredMetadataLanguage ?? string.Empty;
@@ -113,8 +115,7 @@ public class StartupController : BaseJellyfinApiController
         var user = _userManager.Users.First();
         return new StartupUserDto
         {
-            Name = user.Username,
-            Password = user.Password
+            Name = user.Username
         };
     }