diff --git a/src/App.vue b/src/App.vue
index e905f79..78ff659 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -33,11 +33,29 @@ const state = ref({
 onMounted(() => { 
   window.addEventListener("resize", (e) => { state.value.is_small = (e.target.innerWidth < 768) });
   $(document).foundation();
+  if(localStorage.name){ state.value.name = localStorage.name }
+  if(localStorage.server){ state.value.server = localStorage.server }
+  if(!(state.value.room)) {
+      if(localStorage.room){ state.value.room = localStorage.room }
+  }
+  if(localStorage.secret){ state.value.secret = localStorage.secret }
+  if(state.value.server && state.value.room) {
+    connect()
+  }
 })
 
-function setRoomCode(room) { state.value.room = room }
-function setSecret(secret) { state.value.secret = secret }
-function setName(name) { state.value.name = name }
+function emptyLocalStorageAndLogout() {
+    localStorage.removeItem('server')
+    localStorage.removeItem('secret')
+    localStorage.removeItem('name')
+    localStorage.removeItem('room')
+    state.socket.disconnect()
+    state.value.joined = false
+}
+
+function setRoomCode(room) { state.value.room = room; }
+function setSecret(secret) { state.value.secret = secret; }
+function setName(name) { state.value.name = name; localStorage.name=name }
 function setCurrentName(name) { state.value.current_name = name }
 function updateName(evt) { evt.target.textContent = state.value.name;}
 function setServer(server) { state.value.server = server }
@@ -77,7 +95,6 @@ function close_name() {
 }
 
 function connect() {
-  state.socket = io(state.value.server)
   registerSocketEvents(state.socket)
 }
 
@@ -93,34 +110,36 @@ function skip(uuid) {
     state.socket.emit("skip", {"uuid": uuid})
 }
 
-function registerSocketEvents(socket) {
-    socket.on("search-results", (results) => {
+function registerSocketEvents() {
+    state.socket = io(state.value.server)
+    state.socket.on("search-results", (results) => {
       state.value.searching = false
       state.value.search.searchResults = results.results
     })
 
-    socket.on("connect", () => { joinRoom() })
+    state.socket.on("connect", () => { joinRoom() })
 
-    socket.io.on("reconnect", () => { joinRoom() })
+    state.socket.io.on("reconnect", () => { joinRoom() })
 
-    socket.on("disconnect", () => {
-        connect();
-    });
-
-    socket.on("state", (val) => {
+    state.socket.on("state", (val) => {
       state.value.queue=val.queue
       state.value.recent=val.recent
     })
 
-    socket.on("msg", (response) => {        
+    state.socket.on("msg", (response) => {        
         state.value.last_msg = response.msg
         $("#msg").foundation("open")
     })
 }
 
 function joinRoom() {
+    console.log("Joining room " + state.value.room)
     state.socket.emit("register-web", {"room": state.value.room}, (response) => {
     if(response === true) {
+      localStorage.name = state.value.name
+      localStorage.server = state.value.server
+      localStorage.room = state.value.room
+      localStorage.secret = state.value.secret
       state.value.joined = true
       router.push({name: "room", params: {room: state.value.room}})
       if (state.value.secret) {
@@ -135,7 +154,10 @@ function joinRoom() {
                 "install <a href='https://git.k-fortytwo.de/christofsteel/syng2.git' " +
                 "target='_blank'>Syng</a> and run it with <pre>syng-client " + 
                 state.value.server + "</pre>"
-      state.socket.disconnect()
+        if(state.value.joined) {
+            state.socket.disconnect()
+            setTimeout(() => connect(), 2000)
+        }
     }
   })
 }
@@ -169,6 +191,8 @@ function joinRoom() {
       :room="state.room"
       :server="state.server"
       :joinMsg="state.join_msg"
+      :name="state.name"
+      :secret="state.secret"
       @connect="connect"
       @update:room="setRoomCode"
       @update:name="setName"
@@ -192,6 +216,7 @@ function joinRoom() {
   <Footer
     :name="state.name"
     @update:name="setName"
+    @logout="emptyLocalStorageAndLogout"
     />
 </div>
 </template>
diff --git a/src/components/Footer.vue b/src/components/Footer.vue
index 8cc5b7e..56b47fb 100644
--- a/src/components/Footer.vue
+++ b/src/components/Footer.vue
@@ -1,6 +1,6 @@
 <script setup>
 const props = defineProps(['name'])
-const emits = defineEmits(['update:name'])
+const emits = defineEmits(['update:name', 'logout'])
 </script>
 <template>
   <footer>
@@ -12,6 +12,7 @@ const emits = defineEmits(['update:name'])
       >
       {{ name }}
     </span>
+    <div class="button alert fright" @click="$emit('logout')">Log out</div>
   </footer>
 </template>
 <style scoped>
@@ -29,6 +30,11 @@ footer {
   margin: auto;
 }
 
+footer > .button {
+margin-top: 5px;
+margin-right: 5px;
+}
+
 footer > .userName {
   border: none;
   border-bottom: 1px dashed #00F000;
diff --git a/src/components/Result.vue b/src/components/Result.vue
index 6af0816..40b6aac 100644
--- a/src/components/Result.vue
+++ b/src/components/Result.vue
@@ -11,7 +11,7 @@ const emits = defineEmits(['append'])
     <span class="album">{{result.album}}</span>
   </div>
   <div class="cell small-3">
-    <a class="button alert fright" target="_blank" rel="noreferrer noopener" :href="result.id" v-if="result.source == 'youtube'">
+    <a class="button alert fright" target="_blank" rel="noreferrer noopener" :href="result.ident" v-if="result.source == 'youtube'">
 <font-awesome-icon icon="fa-brands fa-youtube" />
     </a>
     <button class="button fright" @click="$emit('append')">
diff --git a/src/components/WelcomeReveal.vue b/src/components/WelcomeReveal.vue
index 2209d20..ce33823 100644
--- a/src/components/WelcomeReveal.vue
+++ b/src/components/WelcomeReveal.vue
@@ -3,7 +3,7 @@ import { onMounted, onBeforeUnmount } from 'vue'
 import $ from 'jquery'
 
 const emits = defineEmits(['connect', 'update:room', 'update:name', 'update:server', 'update:secret'])
-const props = defineProps(['room', 'server', 'joinMsg'])
+const props = defineProps(['room', 'server', 'secret', 'name', 'joinMsg'])
 
 onMounted(() => {
   $(document).foundation();
@@ -30,7 +30,7 @@ onBeforeUnmount(() => {
       </div>
       <div class="medium-6 cell">
         <label>Admin password
-          <input type="password" @input="$emit('update:secret', $event.target.value)" placeholder="Leave free, if not admin">
+          <input type="password" @input="$emit('update:secret', $event.target.value)" :value="secret" placeholder="Leave free, if not admin">
         </label>
       </div>
       <div class="medium-6 cell">
@@ -40,7 +40,7 @@ onBeforeUnmount(() => {
       </div>
       <div class="medium-6 cell">
         <label>Name
-          <input type="text" @input="$emit('update:name', $event.target.value)" placeholder="Arno Nym">
+          <input type="text" @input="$emit('update:name', $event.target.value)" :value="name" placeholder="Arno Nym">
         </label>
       </div>
     </div>