diff --git a/internal/router/helpers.go b/internal/router/helpers.go
index 7eabf64d..9e463177 100644
--- a/internal/router/helpers.go
+++ b/internal/router/helpers.go
@@ -52,13 +52,16 @@ func getTemplateUserWithTheme(c *echo.Context, cfg *Config) (templates.User, err
 	}
 
 	return templates.User{
-		ID:       userID,
-		Email:    userEmail,
-		Username: userUsername,
-		Role:     userRole,
-		Theme:    userTheme,
-		Token:    token,
-		Timezone: userTimezone,
+		ID:        userID,
+		Email:     userEmail,
+		Username:  userUsername,
+		Role:      userRole,
+		Theme:     userTheme,
+		Token:     token,
+		Timezone:  userTimezone,
+		FirstName: getText(userDB.FirstName),
+		LastName:  getText(userDB.LastName),
+		CreatedAt: userDB.CreatedAt.Time,
 	}, nil
 }
 
diff --git a/templates/admin_library.templ b/templates/admin_library.templ
index ef9587cf..603812f1 100644
--- a/templates/admin_library.templ
+++ b/templates/admin_library.templ
@@ -307,7 +307,7 @@ templ LibraryPanel(user User, libraryID string, library LibraryData, folders []F
 							<button
 								class="icon-btn h-7 w-7 shrink-0"
 								hx-delete={ "/admin/library/" + libraryID + "/folders" }
-								hx-vals={ `{"folder_path": "` + folder.FolderPath + `"}` }
+								hx-vals={ hxValsFolderDelete(folder.FolderPath) }
 								hx-target={ "#library-panel-" + libraryID }
 								hx-swap="innerHTML"
 								hx-confirm="Remove this folder from the library?"
diff --git a/templates/admin_library_templ.go b/templates/admin_library_templ.go
index dd5c9027..60bbf24f 100644
--- a/templates/admin_library_templ.go
+++ b/templates/admin_library_templ.go
@@ -432,9 +432,9 @@ func LibraryPanel(user User, libraryID string, library LibraryData, folders []Fo
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var14 string
-				templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.ResolveAttributeValue(`{"folder_path": "` + folder.FolderPath + `"}`)
+				templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.ResolveAttributeValue(hxValsFolderDelete(folder.FolderPath))
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `admin_library.templ`, Line: 310, Col: 64}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `admin_library.templ`, Line: 310, Col: 55}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var14)
 				if templ_7745c5c3_Err != nil {
diff --git a/templates/utils.go b/templates/utils.go
index 7adf3b08..b745fa6d 100644
--- a/templates/utils.go
+++ b/templates/utils.go
@@ -339,3 +339,14 @@ func GroupTunableSettings(entries []SettingEntry) (live, restart []SettingGroup)
 	}
 	return liveGroups, restartGroups
 }
+
+// hxValsFolderDelete builds the hx-vals attribute for removing a library
+// folder: htmx 2 requires valid JSON (or a js: expression) — string
+// concatenation broke on paths containing quotes or backslashes.
+func hxValsFolderDelete(folderPath string) string {
+	b, err := json.Marshal(map[string]string{"folder_path": folderPath})
+	if err != nil {
+		return `js:{"folder_path": ""}`
+	}
+	return "js:" + string(b)
+}