diff --git a/app/routes/hyperapi.py b/app/routes/hyperapi.py
index c9f6dff..26a9d8b 100644
--- a/app/routes/hyperapi.py
+++ b/app/routes/hyperapi.py
@@ -60,11 +60,3 @@ def get_badges():
     uploads = BadgeUploads.get_for_user(get_active_user().id)
     badges = sorted(Badges.findall({'user_id': int(get_active_user().id)}), key=lambda x: x['sort_order'])
     return render_template('components/badge_editor_badges.html', uploads=uploads, badges=badges)
-
-
-@bp.get('/badge-editor/template')
-@login_required
-@account_required
-def get_badge_template():
-    uploads = BadgeUploads.get_for_user(get_active_user().id)
-    return render_template('components/badge_editor_template.html', uploads=uploads)
diff --git a/app/routes/users.py b/app/routes/users.py
index a9b08d4..874320e 100644
--- a/app/routes/users.py
+++ b/app/routes/users.py
@@ -394,7 +394,8 @@ def page(username):
 @login_required
 @redirect_to_own
 def settings(username):
-    return render_template('users/settings.html')
+    uploads = BadgeUploads.get_for_user(get_active_user().id)
+    return render_template('users/settings.html', uploads=uploads)
 
 
 @bp.post('/<username>/settings')
diff --git a/app/templates/common/macros.html b/app/templates/common/macros.html
index 194499a..6260a17 100644
--- a/app/templates/common/macros.html
+++ b/app/templates/common/macros.html
@@ -331,8 +331,8 @@
 {% else %}
   {% set selected_href = defaults[0].file_path %}
 {% endif %}
-<bitty-7-0 data-connect="{{ '/static/js/bitties/pyrom-bitty.js' | cachebust }} BadgeEditorBadge" data-listeners="click input submit change">
-<div class="settings-badge-container" data-receive="deleteBadge">
+<bitty-7-0 data-connect="{{ '/static/js/bitties/pyrom-bitty.js' | cachebust }} BadgeEditorBadge" data-listeners="click input submit change" data-receive="deleteBadge">
+<div class="settings-badge-container">
   <div class="settings-badge-select">
     <select data-send="badgeUpdatePreview badgeToggleFilePicker" name="badge_choice[]" required>
       <optgroup label="Default">
diff --git a/app/templates/components/badge_editor_badges.html b/app/templates/components/badge_editor_badges.html
index ddabdf5..af9c4bc 100644
--- a/app/templates/components/badge_editor_badges.html
+++ b/app/templates/components/badge_editor_badges.html
@@ -1,4 +1,4 @@
-{% from 'common/macros.html' import badge_editor_single with context %}
+{% from 'common/macros.html' import badge_editor_single %}
 {% for badge in badges %}
   {{ badge_editor_single(options=uploads, selected=badge.upload, badge=badge) }}
 {% endfor %}
diff --git a/app/templates/components/badge_editor_template.html b/app/templates/components/badge_editor_template.html
index ef9f881..032f86e 100644
--- a/app/templates/components/badge_editor_template.html
+++ b/app/templates/components/badge_editor_template.html
@@ -1,2 +1,2 @@
-{% from 'common/macros.html' import badge_editor_single with context %}
+{% from 'common/macros.html' import badge_editor_single %}
 {{ badge_editor_single(options=uploads) }}
diff --git a/app/templates/users/settings.html b/app/templates/users/settings.html
index 2288192..37703f0 100644
--- a/app/templates/users/settings.html
+++ b/app/templates/users/settings.html
@@ -1,4 +1,4 @@
-{% from 'common/macros.html' import babycode_editor_component %}
+{% from 'common/macros.html' import babycode_editor_component, badge_editor_single %}
 {% extends 'base.html' %}
 {% block title %}settings{% endblock %}
 {% block content %}
@@ -68,4 +68,8 @@
     <a class="linkbutton critical" href="{{ url_for('users.delete_page', username=active_user.username) }}">Delete account</a>
   </div>
 </div>
+
+<template id='badge-editor-template'>
+{{ badge_editor_single(options=uploads) }}
+</template>
 {% endblock %}
diff --git a/data/static/js/bitties/pyrom-bitty.js b/data/static/js/bitties/pyrom-bitty.js
index 9d86c36..6ef5eae 100644
--- a/data/static/js/bitties/pyrom-bitty.js
+++ b/data/static/js/bitties/pyrom-bitty.js
@@ -287,11 +287,8 @@ export class BadgeEditorForm {
       return;
     }
     if (this.#badgeTemplate === undefined){
-      const badge = await this.api.getHTML(`${badgeEditorEndpoint}/template`)
-      if (!badge.value){
-        return;
-      }
-      this.#badgeTemplate= badge.value;
+      this.#badgeTemplate = document.getElementById('badge-editor-template').content;
+      console.log(this.#badgeTemplate);
     }
     el.replaceChildren();
     const addButton = `<button data-disable-if-max="1" data-receive="updateBadgeCount" DISABLE_IF_MAX type="button" data-send="addBadge">Add badge</button>`;