diff --git a/lnbits/core/static/js/wallet.js b/lnbits/core/static/js/wallet.js
index 27e28ed..45e3ec6 100644
--- a/lnbits/core/static/js/wallet.js
+++ b/lnbits/core/static/js/wallet.js
@@ -138,6 +138,10 @@ new Vue({
       },
       paymentsChart: {
         show: false
+      },
+      disclaimerDialog: {
+        show: false,
+        location: window.location
       }
     };
   },
@@ -339,5 +343,10 @@ new Vue({
   created: function () {
     this.fetchPayments();
     setTimeout(this.checkPendingPayments(), 1200);
+
+    if (!this.$q.localStorage.getItem('lnbits.disclaimerShown')) {
+      this.disclaimerDialog.show = true;
+      this.$q.localStorage.set('lnbits.disclaimerShown', true);
+    };
   }
 });
diff --git a/lnbits/core/templates/core/index.html b/lnbits/core/templates/core/index.html
index ad098d1..6b0fd84 100644
--- a/lnbits/core/templates/core/index.html
+++ b/lnbits/core/templates/core/index.html
@@ -85,16 +85,4 @@
       </div>
     </div>
   </div>
-
-  <q-dialog v-model="disclaimerDialog.show" position="top">
-    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
-      <h5 class="q-my-md">WARNING</h5>
-      <p>
-        Login functionality to be released in V0.2, for now make sure you bookmark to save your wallet!<br/><br/>
-        This service is in BETA, and we hold no responsibility for people losing access to funds.<br/><br/>
-        To encourage you to run your own LNbits, any balance on lnbits.com will incur a charge of 1% per week.
-      </p>
-      <q-btn unelevated color="deep-purple" @click="createWallet">Proceed</q-btn>
-    </q-card>
-  </q-dialog>
 {% endblock %}
diff --git a/lnbits/core/templates/core/wallet.html b/lnbits/core/templates/core/wallet.html
index 4bf947e..7bfad81 100644
--- a/lnbits/core/templates/core/wallet.html
+++ b/lnbits/core/templates/core/wallet.html
@@ -241,4 +241,16 @@
       </q-card-section>
     </q-card>
   </q-dialog>
+
+  <q-dialog v-model="disclaimerDialog.show">
+    <q-card class="q-pa-lg">
+      <h6 class="q-my-md text-deep-purple">Warning</h6>
+      <p>Login functionality to be released in v0.2, for now, <strong>make sure you bookmark this page for future access to your wallet</strong>!</p>
+      <p>This service is in BETA, and we hold no responsibility for people losing access to funds. To encourage you to run your own LNbits installation, any balance on {% raw %}{{ disclaimerDialog.location.host }}{% endraw %} will incur a charge of <strong>1% service fee</strong> per week.</p>
+      <div class="row q-mt-lg">
+        <q-btn outline color="grey" @click="copyText(disclaimerDialog.location.href)">Copy wallet URL</q-btn>
+        <q-btn v-close-popup flat color="grey" class="q-ml-auto">I understand</q-btn>
+      </div>
+    </q-card>
+  </q-dialog>
 {% endblock %}