diff --git a/lnbits/core/templates/core/wallet.html b/lnbits/core/templates/core/wallet.html
index 8ca21c1..f1d4e42 100644
--- a/lnbits/core/templates/core/wallet.html
+++ b/lnbits/core/templates/core/wallet.html
@@ -1,7 +1,17 @@
-{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block scripts %} {{ window_vars(user, wallet) }}
+{% extends "base.html" %}
+<!---->
+{% from "macros.jinja" import window_vars with context
+%}
+<!---->
+{% block scripts %} {{ window_vars(user, wallet) }}
 <script src="/core/static/js/wallet.js"></script>
-{% endblock %} {% block page %}
+{% endblock %}
+<!---->
+{% block title %}
+{{ wallet.name }} - {{ SITE_TITLE }}
+{% endblock %}
+<!---->
+{% block page %}
 <div class="row q-col-gutter-md">
   <div class="col-12 col-md-7 q-gutter-y-md">
     <q-card>
@@ -350,7 +360,7 @@
       {% raw %}
       <q-form @submit="authLnurl" class="q-gutter-md">
         <p class="q-my-none text-h6">
-          Authenticate with <b>{{ parse.lnurlauth.domain }}</b> from wallet <em>{{ g.wallet.name }}</em>?
+          Authenticate with <b>{{ parse.lnurlauth.domain }}</b>?
         </p>
         <q-separator class="q-my-sm"></q-separator>
         <p>
diff --git a/lnbits/templates/base.html b/lnbits/templates/base.html
index 7dce34e..d81cf2a 100644
--- a/lnbits/templates/base.html
+++ b/lnbits/templates/base.html
@@ -8,10 +8,7 @@
     <!---->
     <link rel="stylesheet" type="text/css" href="/static/css/base.css" />
     {% block styles %}{% endblock %}
-    <title>
-      {% block title %} {% if SITE_TITLE != 'LNbits' %}{{ SITE_TITLE }}{% else
-      %}LNbits{% endif %} {% endblock %}
-    </title>
+    <title>{% block title %}{{ SITE_TITLE }}{% endblock %}</title>
     <meta charset="utf-8" />
     <meta
       name="viewport"
diff --git a/lnbits/templates/print.html b/lnbits/templates/print.html
index b62ee15..3b0d078 100644
--- a/lnbits/templates/print.html
+++ b/lnbits/templates/print.html
@@ -15,10 +15,7 @@
       }
     </style>
     {% block styles %}{% endblock %}
-    <title>
-      {% block title %} {% if SITE_TITLE != 'LNbits' %}{{ SITE_TITLE }}{% else
-      %}LNbits{% endif %} {% endblock %}
-    </title>
+    <title>{% block title %}{{ SITE_TITLE }}{% endblock %}</title>
     <meta charset="utf-8" />
     <meta
       name="viewport"