diff --git a/lnbits/extensions/jukebox/static/js/index.js b/lnbits/extensions/jukebox/static/js/index.js
index 6f1f56866..932e16708 100644
--- a/lnbits/extensions/jukebox/static/js/index.js
+++ b/lnbits/extensions/jukebox/static/js/index.js
@@ -93,7 +93,7 @@ new Vue({
     getJukeboxes() {
       self = this
       LNbits.api
-        .request('GET', '/jukebox/api/v1/jukebox', self.g.user.wallets[0].inkey)
+        .request('GET', '/jukebox/api/v1/jukebox', self.g.user.wallets[0].adminkey)
         .then(function (response) {
           self.JukeboxLinks = response.data.map(mapJukebox)
         })
diff --git a/lnbits/extensions/jukebox/templates/jukebox/_api_docs.html b/lnbits/extensions/jukebox/templates/jukebox/_api_docs.html
index f705aeadd..66c2dfcfd 100644
--- a/lnbits/extensions/jukebox/templates/jukebox/_api_docs.html
+++ b/lnbits/extensions/jukebox/templates/jukebox/_api_docs.html
@@ -1,124 +1,101 @@
-<q-expansion-item
-  group="extras"
-  icon="swap_vertical_circle"
-  label="About"
-  :content-inset-level="0.5"
->
-  <q-card>
-    <q-card-section>
-      To use this extension you need a Spotify client ID and client secret. You
-      get these by creating an app in the Spotify developers dashboard
-      <a href="https://developer.spotify.com/dashboard/applications">here </a>
-      <br /><br />Select the playlists you want people to be able to pay for,
-      share the frontend page, profit :) <br /><br />
-      Made by, <a href="https://twitter.com/arcbtc">benarc</a>. Inspired by,
-      <a href="https://twitter.com/pirosb3/status/1056263089128161280"
-        >pirosb3</a
-      >.
-    </q-card-section>
-  </q-card>
-</q-expansion-item>
+<q-card-section>
+  To use this extension you need a Spotify client ID and client secret. You
+  get these by creating an app in the Spotify developers dashboard
+  <a style="color:#43a047" href="https://developer.spotify.com/dashboard/applications">here </a>
+  <br /><br />Select the playlists you want people to be able to pay for,
+  share the frontend page, profit :) <br /><br />
+  Made by, <a style="color:#43a047" href="https://twitter.com/arcbtc">benarc</a>. Inspired by,
+  <a style="color:#43a047" href="https://twitter.com/pirosb3/status/1056263089128161280">pirosb3</a>.
+</q-card-section>
 
-<q-expansion-item
-  group="extras"
-  icon="swap_vertical_circle"
-  label="API info"
-  :content-inset-level="0.5"
->
-  <q-expansion-item
-    group="api"
-    dense
-    expand-separator
-    label="Create item (a shop will be created automatically based on the wallet you use)"
-  >
+
+
+
+
+
+<q-expansion-item group="extras" icon="swap_vertical_circle" label="API info" :content-inset-level="0.5">
+  <q-expansion-item group="api" dense expand-separator label="List jukeboxes">
     <q-card>
       <q-card-section>
-        <code><span class="text-blue">POST</span></code>
+        <code><span class="text-blue">GET</span>
+          /jukebox/api/v1/jukebox</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
-        <code>{"X-Api-Key": &lt;invoice_key&gt;}</code><br />
-        <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
-        <h5 class="text-caption q-mt-sm q-mb-none">Returns 201 OK</h5>
-        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-        <code
-          >curl -X GET {{ request.url_root }}/jukebox/api/v1/jukebox/items -H
-          "Content-Type: application/json" -H "X-Api-Key: {{
-          g.user.wallets[0].inkey }}" -d '{"name": &lt;string&gt;,
-          "description": &lt;string&gt;, "image": &lt;data-uri string&gt;,
-          "price": &lt;integer&gt;, "unit": &lt;"sat" or "USD"&gt;}'
-        </code>
-      </q-card-section>
-    </q-card>
-  </q-expansion-item>
-  <q-expansion-item
-    group="api"
-    dense
-    expand-separator
-    label="Get the shop data along with items"
-  >
-    <q-card>
-      <q-card-section>
-        <code><span class="text-blue">GET</span></code>
-        <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
-        <code>{"X-Api-Key": &lt;invoice_key&gt;}</code><br />
+        <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
         <h5 class="text-caption q-mt-sm q-mb-none">
           Returns 200 OK (application/json)
         </h5>
-        <code
-          >{"id": &lt;integer&gt;, "wallet": &lt;string&gt;, "wordlist":
-          &lt;string&gt;, "items": [{"id": &lt;integer&gt;, "name":
-          &lt;string&gt;, "description": &lt;string&gt;, "image":
-          &lt;string&gt;, "enabled": &lt;boolean&gt;, "price": &lt;integer&gt;,
-          "unit": &lt;string&gt;, "lnurl": &lt;string&gt;}, ...]}&lt;</code
-        >
+        <code>[&lt;jukebox_object&gt;, ...]</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-        <code
-          >curl -X GET {{ request.url_root }}/jukebox/api/v1/jukebox -H
-          "X-Api-Key: {{ g.user.wallets[0].inkey }}"
+        <code>curl -X GET {{ request.url_root }}api/v1/jukebox -H "X-Api-Key: {{
+          g.user.wallets[0].adminkey }}"
         </code>
       </q-card-section>
     </q-card>
   </q-expansion-item>
-  <q-expansion-item
-    group="api"
-    dense
-    expand-separator
-    label="Update item (all fields must be sent again)"
-  >
+  <q-expansion-item group="api" dense expand-separator label="Get jukebox">
     <q-card>
       <q-card-section>
-        <code><span class="text-blue">PUT</span></code>
+        <code><span class="text-blue">GET</span>
+          /jukebox/api/v1/jukebox/&lt;juke_id&gt;</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
-        <code>{"X-Api-Key": &lt;invoice_key&gt;}</code><br />
+        <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
-        <h5 class="text-caption q-mt-sm q-mb-none">Returns 200 OK</h5>
+        <h5 class="text-caption q-mt-sm q-mb-none">
+          Returns 200 OK (application/json)
+        </h5>
+        <code>&lt;jukebox_object&gt;</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-        <code
-          >curl -X GET {{ request.url_root
-          }}/jukebox/api/v1/jukebox/items/&lt;item_id&gt; -H "Content-Type:
-          application/json" -H "X-Api-Key: {{ g.user.wallets[0].inkey }}" -d
-          '{"name": &lt;string&gt;, "description": &lt;string&gt;, "image":
-          &lt;data-uri string&gt;, "price": &lt;integer&gt;, "unit": &lt;"sat"
-          or "USD"&gt;}'
+        <code>curl -X GET {{ request.url_root }}api/v1/jukebox/&lt;juke_id&gt; -H "X-Api-Key: {{
+          g.user.wallets[0].adminkey }}"
         </code>
       </q-card-section>
     </q-card>
   </q-expansion-item>
-  <q-expansion-item group="api" dense expand-separator label="Delete item">
+  <q-expansion-item group="api" dense expand-separator label="Create/update track">
     <q-card>
       <q-card-section>
-        <code><span class="text-blue">DELETE</span></code>
+        <code><span class="text-green">POST/PUT</span>
+          /jukebox/api/v1/jukebox/</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
-        <code>{"X-Api-Key": &lt;invoice_key&gt;}</code><br />
-        <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
-        <h5 class="text-caption q-mt-sm q-mb-none">Returns 200 OK</h5>
+        <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
+        <h5 class="text-caption q-mt-sm q-mb-none">
+          Body (application/json)
+        </h5>
+        <h5 class="text-caption q-mt-sm q-mb-none">
+          Returns 200 OK (application/json)
+        </h5>
+        <code>&lt;jukbox_object&gt;</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-        <code
-          >curl -X GET {{ request.url_root
-          }}/jukebox/api/v1/jukebox/items/&lt;item_id&gt; -H "X-Api-Key: {{
-          g.user.wallets[0].inkey }}"
+        <code>curl -X POST {{ request.url_root }}api/v1/jukebox/ -d
+          '{"user": &lt;string, user_id&gt;,
+          "title": &lt;string&gt;, "wallet":&lt;string&gt;, "sp_user":
+          &lt;string, spotify_user_account&gt;, "sp_secret": &lt;string, spotify_user_secret&gt;, "sp_access_token":
+          &lt;string, not_required&gt;, "sp_refresh_token":
+          &lt;string, not_required&gt;, "sp_device": &lt;string, spotify_user_secret&gt;, "sp_playlists":
+          &lt;string, not_required&gt;, "price":
+          &lt;integer, not_required&gt;}' -H "Content-type:
+          application/json" -H "X-Api-Key: {{g.user.wallets[0].adminkey }}"
         </code>
       </q-card-section>
     </q-card>
   </q-expansion-item>
-</q-expansion-item>
+  <q-expansion-item group="api" dense expand-separator label="Delete jukebox">
+    <q-card>
+      <q-card-section>
+        <code><span class="text-red">DELETE</span>
+          /jukebox/api/v1/jukebox/&lt;juke_id&gt;</code>
+        <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
+        <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
+        <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
+        <h5 class="text-caption q-mt-sm q-mb-none">
+          Returns 200 OK (application/json)
+        </h5>
+        <code>&lt;jukebox_object&gt;</code>
+        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+        <code>curl -X DELETE {{ request.url_root }}api/v1/jukebox/&lt;juke_id&gt; -H "X-Api-Key: {{
+          g.user.wallets[0].adminkey }}"
+        </code>
+      </q-card-section>
+    </q-card>
+  </q-expansion-item>
\ No newline at end of file
diff --git a/lnbits/extensions/jukebox/templates/jukebox/index.html b/lnbits/extensions/jukebox/templates/jukebox/index.html
index ca14ad96c..25cc49e52 100644
--- a/lnbits/extensions/jukebox/templates/jukebox/index.html
+++ b/lnbits/extensions/jukebox/templates/jukebox/index.html
@@ -4,36 +4,18 @@
   <div class="col-12 col-md-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
-        <q-btn
-          unelevated
-          color="green-7"
-          class="q-ma-lg"
-          @click="openNewDialog()"
-          >Add Spotify Jukebox</q-btn
-        >
+        <q-btn unelevated color="green-7" class="q-ma-lg" @click="openNewDialog()">Add Spotify Jukebox</q-btn>
 
         {% raw %}
 
-        <q-table
-          flat
-          dense
-          :data="JukeboxLinks"
-          row-key="id"
-          :columns="JukeboxTable.columns"
-          :pagination.sync="JukeboxTable.pagination"
-          :filter="filter"
-        >
+        <q-table flat dense :data="JukeboxLinks" row-key="id" :columns="JukeboxTable.columns"
+          :pagination.sync="JukeboxTable.pagination" :filter="filter">
           <template v-slot:header="props">
             <q-tr :props="props">
               <q-th auto-width></q-th>
               <q-th auto-width></q-th>
 
-              <q-th
-                v-for="col in props.cols"
-                :key="col.name"
-                :props="props"
-                auto-width
-              >
+              <q-th v-for="col in props.cols" :key="col.name" :props="props" auto-width>
                 <div v-if="col.name == 'id'"></div>
                 <div v-else>{{ col.label }}</div>
               </q-th>
@@ -44,43 +26,18 @@
           <template v-slot:body="props">
             <q-tr :props="props">
               <q-td auto-width>
-                <q-btn
-                  unelevated
-                  dense
-                  size="xs"
-                  icon="launch"
-                  :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-                  @click="openQrCodeDialog(props.row.sp_id)"
-                >
+                <q-btn unelevated dense size="xs" icon="launch" :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
+                  @click="openQrCodeDialog(props.row.sp_id)">
                   <q-tooltip> Jukebox QR </q-tooltip>
                 </q-btn>
               </q-td>
               <q-td auto-width>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="updateJukebox(props.row.id)"
-                  icon="edit"
-                  color="light-blue"
-                ></q-btn>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="deleteJukebox(props.row.id)"
-                  icon="cancel"
-                  color="pink"
-                >
+                <q-btn flat dense size="xs" @click="updateJukebox(props.row.id)" icon="edit" color="light-blue"></q-btn>
+                <q-btn flat dense size="xs" @click="deleteJukebox(props.row.id)" icon="cancel" color="pink">
                   <q-tooltip> Delete Jukebox </q-tooltip>
                 </q-btn>
               </q-td>
-              <q-td
-                v-for="col in props.cols"
-                :key="col.name"
-                :props="props"
-                auto-width
-              >
+              <q-td v-for="col in props.cols" :key="col.name" :props="props" auto-width>
                 <div v-if="col.name == 'id'"></div>
                 <div v-else>{{ col.value }}</div>
               </q-td>
@@ -106,62 +63,23 @@
 
   <q-dialog v-model="jukeboxDialog.show" position="top" @hide="closeFormDialog">
     <q-card class="q-pa-md q-pt-lg q-mt-md" style="width: 100%">
-      <q-stepper
-        v-model="step"
-        active-color="green-7"
-        inactive-color="green-10"
-        vertical
-        animated
-      >
-        <q-step
-          :name="1"
-          title="Pick wallet, price"
-          icon="account_balance_wallet"
-          :done="step > 1"
-        >
-          <q-input
-            filled
-            class="q-pt-md"
-            dense
-            v-model.trim="jukeboxDialog.data.title"
-            label="Jukebox name"
-          ></q-input>
-          <q-select
-            class="q-pb-md q-pt-md"
-            filled
-            dense
-            emit-value
-            v-model="jukeboxDialog.data.wallet"
-            :options="g.user.walletOptions"
-            label="Wallet to use"
-          ></q-select>
-          <q-input
-            filled
-            dense
-            v-model.trim="jukeboxDialog.data.price"
-            type="number"
-            max="1440"
-            label="Price per track"
-            class="q-pb-lg"
-          >
+      <q-stepper v-model="step" active-color="green-7" inactive-color="green-10" vertical animated>
+        <q-step :name="1" title="Pick wallet, price" icon="account_balance_wallet" :done="step > 1">
+          <q-input filled class="q-pt-md" dense v-model.trim="jukeboxDialog.data.title" label="Jukebox name"></q-input>
+          <q-select class="q-pb-md q-pt-md" filled dense emit-value v-model="jukeboxDialog.data.wallet"
+            :options="g.user.walletOptions" label="Wallet to use"></q-select>
+          <q-input filled dense v-model.trim="jukeboxDialog.data.price" type="number" max="1440" label="Price per track"
+            class="q-pb-lg">
           </q-input>
           <div class="row">
             <div class="col-4">
               <q-btn
                 v-if="jukeboxDialog.data.title != null && jukeboxDialog.data.price != null && jukeboxDialog.data.wallet != null"
-                color="green-7"
-                @click="step = 2"
-                >Continue</q-btn
-              >
+                color="green-7" @click="step = 2">Continue</q-btn>
               <q-btn v-else color="green-7" disable>Continue</q-btn>
             </div>
             <div class="col-8">
-              <q-btn
-                color="green-7"
-                class="float-right"
-                @click="closeFormDialog"
-                >Cancel</q-btn
-              >
+              <q-btn color="green-7" class="float-right" @click="closeFormDialog">Cancel</q-btn>
             </div>
           </div>
 
@@ -172,55 +90,26 @@
           <img src="/jukebox/static/spotapi.gif" />
           To use this extension you need a Spotify client ID and client secret.
           You get these by creating an app in the Spotify developers dashboard
-          <a
-            target="_blank"
-            color="green-7"
-            href="https://developer.spotify.com/dashboard/applications"
-            >here</a
-          >.
-          <q-input
-            filled
-            class="q-pb-md q-pt-md"
-            dense
-            v-model.trim="jukeboxDialog.data.sp_user"
-            label="Client ID"
-          ></q-input>
+          <a target="_blank" style="color:#43a047" href="https://developer.spotify.com/dashboard/applications">here</a>.
+          <q-input filled class="q-pb-md q-pt-md" dense v-model.trim="jukeboxDialog.data.sp_user" label="Client ID">
+          </q-input>
 
-          <q-input
-            dense
-            v-model="jukeboxDialog.data.sp_secret"
-            filled
-            :type="isPwd ? 'password' : 'text'"
-            label="Client secret"
-          >
+          <q-input dense v-model="jukeboxDialog.data.sp_secret" filled :type="isPwd ? 'password' : 'text'"
+            label="Client secret">
             <template #append>
-              <q-icon
-                :name="isPwd ? 'visibility_off' : 'visibility'"
-                class="cursor-pointer"
-                @click="isPwd = !isPwd"
-              ></q-icon>
+              <q-icon :name="isPwd ? 'visibility_off' : 'visibility'" class="cursor-pointer" @click="isPwd = !isPwd">
+              </q-icon>
             </template>
           </q-input>
 
           <div class="row q-mt-md">
             <div class="col-4">
-              <q-btn
-                v-if="jukeboxDialog.data.sp_secret != null && jukeboxDialog.data.sp_user != null && tokenFetched"
-                color="green-7"
-                @click="submitSpotifyKeys"
-                >Submit keys</q-btn
-              >
-              <q-btn v-else color="green-7" disable color="green-7"
-                >Submit keys</q-btn
-              >
+              <q-btn v-if="jukeboxDialog.data.sp_secret != null && jukeboxDialog.data.sp_user != null && tokenFetched"
+                color="green-7" @click="submitSpotifyKeys">Submit keys</q-btn>
+              <q-btn v-else color="green-7" disable color="green-7">Submit keys</q-btn>
             </div>
             <div class="col-8">
-              <q-btn
-                color="green-7"
-                class="float-right"
-                @click="closeFormDialog"
-                >Cancel</q-btn
-              >
+              <q-btn color="green-7" class="float-right" @click="closeFormDialog">Cancel</q-btn>
             </div>
           </div>
 
@@ -230,93 +119,43 @@
         <q-step :name="3" title="Add Redirect URI" icon="link" :done="step > 3">
           <img src="/jukebox/static/spotapi1.gif" />
           In the app go to edit-settings, set the redirect URI to this link
-          <br /><q-btn
-            dense
-            outline
-            unelevated
-            color="green-7"
-            size="xs"
-            @click="copyText(locationcb + jukeboxDialog.data.sp_id, 'Link copied to clipboard!')"
-            >{% raw %}{{ locationcb }}{{ jukeboxDialog.data.sp_id }}{% endraw
-            %}<q-tooltip> Click to copy URL </q-tooltip></q-btn
-          >
+          <br />
+          <q-btn dense outline unelevated color="green-7" size="xs"
+            @click="copyText(locationcb + jukeboxDialog.data.sp_id, 'Link copied to clipboard!')">{% raw %}{{ locationcb
+            }}{{ jukeboxDialog.data.sp_id }}{% endraw
+            %}<q-tooltip> Click to copy URL </q-tooltip>
+          </q-btn>
           <br />
           Settings can be found
-          <a
-            target="_blank"
-            color="green-7"
-            href="https://developer.spotify.com/dashboard/applications"
-            >here</a
-          >.
+          <a target="_blank" style="color:#43a047" href="https://developer.spotify.com/dashboard/applications">here</a>.
 
           <div class="row q-mt-md">
             <div class="col-4">
-              <q-btn
-                v-if="jukeboxDialog.data.sp_secret != null && jukeboxDialog.data.sp_user != null && tokenFetched"
-                color="green-7"
-                @click="authAccess"
-                >Authorise access</q-btn
-              >
-              <q-btn v-else color="green-7" disable color="green-7"
-                >Authorise access</q-btn
-              >
+              <q-btn v-if="jukeboxDialog.data.sp_secret != null && jukeboxDialog.data.sp_user != null && tokenFetched"
+                color="green-7" @click="authAccess">Authorise access</q-btn>
+              <q-btn v-else color="green-7" disable color="green-7">Authorise access</q-btn>
             </div>
             <div class="col-8">
-              <q-btn
-                color="green-7"
-                class="float-right"
-                @click="closeFormDialog"
-                >Cancel</q-btn
-              >
+              <q-btn color="green-7" class="float-right" @click="closeFormDialog">Cancel</q-btn>
             </div>
           </div>
 
           <br />
         </q-step>
 
-        <q-step
-          :name="4"
-          title="Select playlists"
-          icon="queue_music"
-          active-color="green-8"
-          :done="step > 4"
-        >
-          <q-select
-            class="q-pb-md q-pt-md"
-            filled
-            dense
-            emit-value
-            v-model="jukeboxDialog.data.sp_device"
-            :options="devices"
-            label="Device jukebox will play to"
-          ></q-select>
-          <q-select
-            class="q-pb-md"
-            filled
-            dense
-            multiple
-            emit-value
-            v-model="jukeboxDialog.data.sp_playlists"
-            :options="playlists"
-            label="Playlists available to the jukebox"
-          ></q-select>
+        <q-step :name="4" title="Select playlists" icon="queue_music" active-color="green-8" :done="step > 4">
+          <q-select class="q-pb-md q-pt-md" filled dense emit-value v-model="jukeboxDialog.data.sp_device"
+            :options="devices" label="Device jukebox will play to"></q-select>
+          <q-select class="q-pb-md" filled dense multiple emit-value v-model="jukeboxDialog.data.sp_playlists"
+            :options="playlists" label="Playlists available to the jukebox"></q-select>
           <div class="row q-mt-md">
             <div class="col-5">
-              <q-btn
-                v-if="jukeboxDialog.data.sp_device != null && jukeboxDialog.data.sp_playlists != null"
-                color="green-7"
-                @click="createJukebox"
-                >Create Jukebox</q-btn
-              >
+              <q-btn v-if="jukeboxDialog.data.sp_device != null && jukeboxDialog.data.sp_playlists != null"
+                color="green-7" @click="createJukebox">Create Jukebox</q-btn>
               <q-btn v-else color="green-7" disable>Create Jukebox</q-btn>
             </div>
             <div class="col-7">
-              <q-btn
-                color="green-7"
-                class="float-right"
-                @click="closeFormDialog"
-                >Cancel</q-btn
-              >
+              <q-btn color="green-7" class="float-right" @click="closeFormDialog">Cancel</q-btn>
             </div>
           </div>
         </q-step>
@@ -326,29 +165,19 @@
 
   <q-dialog v-model="qrCodeDialog.show" position="top">
     <q-card v-if="qrCodeDialog.data" class="q-pa-lg lnbits__dialog-card">
-      <center><h5 class="q-my-none">Shareable Jukebox QR</h5></center>
+      <center>
+        <h5 class="q-my-none">Shareable Jukebox QR</h5>
+      </center>
       <q-responsive :ratio="1" class="q-mx-xl q-mb-md">
-        <qrcode
-          :value="qrCodeDialog.data.url + '/jukebox/' + qrCodeDialog.data.id"
-          :options="{width: 800}"
-          class="rounded-borders"
-        ></qrcode>
+        <qrcode :value="qrCodeDialog.data.url + '/jukebox/' + qrCodeDialog.data.id" :options="{width: 800}"
+          class="rounded-borders"></qrcode>
       </q-responsive>
       <div class="row q-mt-lg q-gutter-sm">
-        <q-btn
-          outline
-          color="grey"
-          @click="copyText(qrCodeDialog.data.url + '/jukebox/' + qrCodeDialog.data.id, 'Link copied to clipboard!')"
-          >Copy jukebox link</q-btn
-        >
-        <q-btn
-          outline
-          color="grey"
-          type="a"
-          :href="qrCodeDialog.data.url + '/jukebox/' + qrCodeDialog.data.id"
-          target="_blank"
-          >Open jukebox</q-btn
-        >
+        <q-btn outline color="grey"
+          @click="copyText(qrCodeDialog.data.url + '/jukebox/' + qrCodeDialog.data.id, 'Link copied to clipboard!')">
+          Copy jukebox link</q-btn>
+        <q-btn outline color="grey" type="a" :href="qrCodeDialog.data.url + '/jukebox/' + qrCodeDialog.data.id"
+          target="_blank">Open jukebox</q-btn>
         <q-btn v-close-popup flat color="grey" class="q-ml-auto">Close</q-btn>
       </div>
     </q-card>
@@ -357,4 +186,4 @@
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
 <script src="https://cdn.jsdelivr.net/npm/pica@6.1.1/dist/pica.min.js"></script>
 <script src="/jukebox/static/js/index.js"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/lnbits/extensions/jukebox/templates/jukebox/jukebox.html b/lnbits/extensions/jukebox/templates/jukebox/jukebox.html
index 0d2543387..7f174463a 100644
--- a/lnbits/extensions/jukebox/templates/jukebox/jukebox.html
+++ b/lnbits/extensions/jukebox/templates/jukebox/jukebox.html
@@ -161,9 +161,9 @@
                     'GET',
                     '/jukebox/api/v1/jukebox/jb/invoicep/' + song_id + '/{{ juke_id }}/' + self.receive.paymentHash)
                   .then(function (response1) {
-                 
+
                     if (response1.data[2] == song_id) {
-                      setTimeout(function(){ self.getCurrent() }, 500)
+                      setTimeout(function () { self.getCurrent() }, 500)
                       self.$q.notify({
                         color: 'green',
                         message:
@@ -186,10 +186,15 @@
 
           })
           .catch(err => {
-            LNbits.utils.notifyApiError(err)
-          })
-          
 
+            self.$q.notify({
+              color: 'warning',
+              html: true,
+              message:
+                '<center>Device is not connected! <br/> Ask the host to turn on their device and have Spotify open</center>',
+              timeout: 5000
+            })
+          })
       },
       checkInvoice(juke_id, paymentHash) {
 
@@ -201,7 +206,7 @@
             'filla'
           )
           .then(function (response) {
-           
+
             self.paid = response.data.paid
           })
           .catch(function (error) {
@@ -216,7 +221,7 @@
             '/jukebox/api/v1/jukebox/jb/currently/{{juke_id}}')
           .then(function (res) {
             if (res.data.id) {
-             
+
               self.currentlyPlaying = res.data
             }
           })
diff --git a/lnbits/extensions/jukebox/views_api.py b/lnbits/extensions/jukebox/views_api.py
index c584aca89..4bd1fb40f 100644
--- a/lnbits/extensions/jukebox/views_api.py
+++ b/lnbits/extensions/jukebox/views_api.py
@@ -3,6 +3,7 @@ from http import HTTPStatus
 import base64
 from lnbits.core.crud import get_wallet
 from lnbits.core.services import create_invoice, check_invoice_status
+import json
 
 from lnbits.decorators import api_check_wallet_key, api_validate_post_request
 import httpx
@@ -21,7 +22,7 @@ from lnbits.core.services import create_invoice, check_invoice_status
 
 
 @jukebox_ext.route("/api/v1/jukebox", methods=["GET"])
-@api_check_wallet_key("invoice")
+@api_check_wallet_key("admin")
 async def api_get_jukeboxs():
     try:
         return (
@@ -66,10 +67,10 @@ async def api_check_credentials_callbac(juke_id):
     return "<h1>Success!</h1><h2>You can close this window</h2>"
 
 
-@jukebox_ext.route("/api/v1/jukebox/spotify/<sp_id>", methods=["GET"])
-@api_check_wallet_key("invoice")
-async def api_check_credentials_check(sp_id):
-    jukebox = await get_jukebox(sp_id)
+@jukebox_ext.route("/api/v1/jukebox/<juke_id>", methods=["GET"])
+@api_check_wallet_key("admin")
+async def api_check_credentials_check(juke_id):
+    jukebox = await get_jukebox(juke_id)
     return jsonify(jukebox._asdict()), HTTPStatus.CREATED
 
 
@@ -87,7 +88,7 @@ async def api_check_credentials_check(sp_id):
         "sp_refresh_token": {"type": "string", "required": False},
         "sp_device": {"type": "string", "required": False},
         "sp_playlists": {"type": "string", "required": False},
-        "price": {"type": "string", "required": True},
+        "price": {"type": "string", "required": False},
     }
 )
 async def api_create_update_jukebox(juke_id=None):
@@ -264,6 +265,23 @@ async def api_get_jukebox_invoice(juke_id, song_id):
             jsonify({"error": "No Jukebox"}),
             HTTPStatus.FORBIDDEN,
         )
+    try:
+        deviceCheck = await api_get_jukebox_device_check(juke_id)
+        devices = json.loads(deviceCheck[0].text)
+        deviceConnected = False
+        for device in devices["devices"]:
+            if device["id"] == jukebox.sp_device.split("-")[1]:
+                deviceConnected = True
+        if not deviceConnected:
+            return (
+                jsonify({"error": "No device connected"}),
+                HTTPStatus.NOT_FOUND,
+            )
+    except:
+        return (
+            jsonify({"error": "No device connected"}),
+            HTTPStatus.NOT_FOUND,
+        )
 
     invoice = await create_invoice(
         wallet_id=jukebox.wallet,