diff --git a/core/static/webpack/user/family-graph-index.js b/core/static/webpack/user/family-graph-index.js
index 76334fd4..8c7a9773 100644
--- a/core/static/webpack/user/family-graph-index.js
+++ b/core/static/webpack/user/family-graph-index.js
@@ -159,20 +159,25 @@ function createGraph(container, data, activeUserId) {
 }
 
 /**
- * Create a family graph of an user
- * @param {string} Base url for fetching the tree as a string
- * @param {string} Id of the user to fetch the tree from
- * @param {number} Minimum tree depth for godfathers and godchildren
- * @param {number} Maximum tree depth for godfathers and godchildren
+ * @typedef FamilyGraphConfig
+ * @param {string} apiUrl Base url for fetching the tree as a string
+ * @param {string} activeUser Id of the user to fetch the tree from
+ * @param {number} depthMin Minimum tree depth for godfathers and godchildren
+ * @param {number} depthMax Maximum tree depth for godfathers and godchildren
  **/
-window.loadFamilyGraph = (apiUrl, activeUser, depthMin, depthMax) => {
+
+/**
+ * Create a family graph of an user
+ * @param {FamilyGraphConfig} Configuration
+ **/
+window.loadFamilyGraph = (config) => {
   document.addEventListener("alpine:init", () => {
     const defaultDepth = 2;
 
     function getInitialDepth(prop) {
       // biome-ignore lint/correctness/noUndeclaredVariables: defined by script.js
       const value = Number.parseInt(initialUrlParams.get(prop));
-      if (Number.isNaN(value) || value < depthMin || value > depthMax) {
+      if (Number.isNaN(value) || value < config.depthMin || value > config.depthMax) {
         return defaultDepth;
       }
       return value;
@@ -193,7 +198,7 @@ window.loadFamilyGraph = (apiUrl, activeUser, depthMin, depthMax) => {
         }, 100);
         for (const param of ["godfathersDepth", "godchildrenDepth"]) {
           this.$watch(param, async (value) => {
-            if (value < depthMin || value > depthMax) {
+            if (value < config.depthMin || value > config.depthMax) {
               return;
             }
             // biome-ignore lint/correctness/noUndeclaredVariables: defined by script.js
@@ -207,7 +212,7 @@ window.loadFamilyGraph = (apiUrl, activeUser, depthMin, depthMax) => {
           await this.reverseGraph();
         });
         this.$watch("graphData", async () => {
-          await this.generateGraph();
+          this.generateGraph();
           if (this.reverse) {
             await this.reverseGraph();
           }
@@ -243,15 +248,19 @@ window.loadFamilyGraph = (apiUrl, activeUser, depthMin, depthMax) => {
 
       async fetchGraphData() {
         this.graphData = await getGraphData(
-          apiUrl,
+          config.apiUrl,
           this.godfathersDepth,
           this.godchildrenDepth,
         );
       },
 
-      async generateGraph() {
+      generateGraph() {
         this.loading = true;
-        this.graph = await createGraph($(this.$refs.graph), this.graphData, activeUser);
+        this.graph = createGraph(
+          $(this.$refs.graph),
+          this.graphData,
+          config.activeUser,
+        );
         this.loading = false;
       },
     }));
diff --git a/core/static/webpack/user/pictures-index.js b/core/static/webpack/user/pictures-index.js
index 4fe6f22c..d0be8d55 100644
--- a/core/static/webpack/user/pictures-index.js
+++ b/core/static/webpack/user/pictures-index.js
@@ -27,10 +27,15 @@ import { showSaveFilePicker } from "native-file-system-adapter";
  */
 
 /**
- * Load user picture page with a nice download bar
- * @param {string} Url of the api endpoint to fetch pictures from the user
+ * @typedef PicturePageConfig
+ * @param {string} apiUrl Url of the api endpoint to fetch pictures from the user
  **/
-window.loadPicturePage = (apiUrl) => {
+
+/**
+ * Load user picture page with a nice download bar
+ * @param {PicturePageConfig} Configuration
+ **/
+window.loadPicturePage = (config) => {
   document.addEventListener("alpine:init", () => {
     Alpine.data("user_pictures", () => ({
       isDownloading: false,
@@ -40,7 +45,7 @@ window.loadPicturePage = (apiUrl) => {
 
       async init() {
         // biome-ignore lint/correctness/noUndeclaredVariables: imported from script.json
-        this.pictures = await fetchPaginated(apiUrl);
+        this.pictures = await fetchPaginated(config.apiUrl);
         this.albums = this.pictures.reduce((acc, picture) => {
           if (!acc[picture.album]) {
             acc[picture.album] = [];
diff --git a/core/templates/core/user_godfathers_tree.jinja b/core/templates/core/user_godfathers_tree.jinja
index 95d165f4..979c8ab4 100644
--- a/core/templates/core/user_godfathers_tree.jinja
+++ b/core/templates/core/user_godfathers_tree.jinja
@@ -91,13 +91,13 @@
 
   <script>
     window.addEventListener("DOMContentLoaded", () => {
-      loadFamilyGraph(
-        "{{ api_url }}",
-        "{{ object.id }}",
-        {{ depth_min }},
-        {{ depth_max }},
-      );
-    })
+      loadFamilyGraph({
+        apiUrl: "{{ api_url }}",
+        activeUser: "{{ object.id }}",
+        depthMin: {{ depth_min }},
+        depthMax: {{ depth_max }},
+      });
+    });
   </script>
 {% endblock %}
 
diff --git a/core/templates/core/user_pictures.jinja b/core/templates/core/user_pictures.jinja
index c13cee85..c67df69b 100644
--- a/core/templates/core/user_pictures.jinja
+++ b/core/templates/core/user_pictures.jinja
@@ -62,7 +62,9 @@
   {{ super() }}
   <script>
     window.addEventListener("DOMContentLoaded", () => {
-      loadPicturePage("{{ url("api:pictures") }}" + "?users_identified={{ object.id }}");
+      loadPicturePage({
+        apiUrl: "{{ url("api:pictures") }}?users_identified={{ object.id }}"
+      });
     })
   </script>
 {% endblock script %}