diff --git a/src/components/app/Popouts/Popouts/AddServer.vue b/src/components/app/Popouts/Popouts/AddServer.vue
index 35ade90..562814a 100644
--- a/src/components/app/Popouts/Popouts/AddServer.vue
+++ b/src/components/app/Popouts/Popouts/AddServer.vue
@@ -153,7 +153,10 @@ export default {
       if (event.target.classList.contains("button-clicked")) return;
       event.target.classList.add("button-clicked");
       const { ok, error, result } = await ServerService.joinServer(
-        this.inviteCode
+        this.inviteCode,
+        {
+          socketID: this.$socket.id
+        }
       );
       if (ok) {
         this.closeMenu();
diff --git a/src/components/app/Tabs/Explore/serverTemplate.vue b/src/components/app/Tabs/Explore/serverTemplate.vue
index 8b98473..f79e6e8 100644
--- a/src/components/app/Tabs/Explore/serverTemplate.vue
+++ b/src/components/app/Tabs/Explore/serverTemplate.vue
@@ -27,6 +27,7 @@
 </template>
 
 <script>
+import {bus} from '@/main'
 import Spinner from "@/components/Spinner";
 import ServerService from "@/services/ServerService";
 import config from "@/config.js";
@@ -48,7 +49,9 @@ export default {
       if (this.joinClicked|| this.joined) return;
 			this.joinClicked = true;
 
-      const { ok, error, result } = await ServerService.joinServerById(this.server.server.server_id);
+      const { ok, error, result } = await ServerService.joinServerById(this.server.server.server_id, {
+        socketID: this.$socket.id
+      });      
       if (ok) {
         this.joinClicked = false;
       }
@@ -57,6 +60,9 @@ export default {
 	computed: {
 		joined() {
       return this.$store.getters["servers/servers"][this.server.server.server_id];
+    },
+    channels() {
+      return this.$store.getters.channels;
     }
 	}
 };
diff --git a/src/services/ServerService.js b/src/services/ServerService.js
index 505ffc1..907c4b6 100644
--- a/src/services/ServerService.js
+++ b/src/services/ServerService.js
@@ -28,11 +28,11 @@ export default {
   getInviteDetail (inviteCode) {
     return wrapper (instance().get(`/servers/invite/${inviteCode}`))
   },
-  joinServer (inviteCode) {
-    return wrapper (instance().post(`/servers/invite/${inviteCode}`))
+  joinServer (inviteCode, optionalData) {
+    return wrapper (instance().post(`/servers/invite/${inviteCode}`, optionalData))
   },
-  joinServerById (server_id) {
-    return wrapper (instance().post(`/servers/invite/servers/${server_id}`))
+  joinServerById (server_id, optionalData) {
+    return wrapper (instance().post(`/servers/invite/servers/${server_id}`, optionalData))
   },
   leaveServer (serverID) {
     return wrapper (instance().delete(`/servers/${serverID}`))
diff --git a/src/store/modules/socketIOModule.js b/src/store/modules/socketIOModule.js
index 4528c1c..af156e7 100644
--- a/src/store/modules/socketIOModule.js
+++ b/src/store/modules/socketIOModule.js
@@ -245,6 +245,7 @@ const actions = {
 
     const channels = server.channels;
 
+    
     for (let index = 0; index < channels.length; index++) {
       const element = channels[index];
       element.server = undefined;
@@ -255,6 +256,14 @@ const actions = {
         channelsIDs: [element.channelID]
       });
     }
+    
+    if (!server.socketID) return;
+    if (this._vm.$socket.id !== server.socketID) return;
+    const defaultChannel = channels.find(c => c.channelID === server.default_channel_id)
+    bus.$emit('changeTab', 2)
+    context.dispatch('servers/setSelectedServerID', server.server_id, {root: true})
+    context.dispatch('openChannel', defaultChannel, {root: true})
+
 
   },
   ['socket_server:leave'](context, {server_id}) {
diff --git a/src/utils/changelog.js b/src/utils/changelog.js
index 8822369..f2ab727 100644
--- a/src/utils/changelog.js
+++ b/src/utils/changelog.js
@@ -14,12 +14,26 @@
 
 const config = [
 
+  {
+    version: 7.1,
+    title: "TODO: UPDATE ME",
+    shortTitle: "",
+    date: "19/09/2019",
+    headColor: "rgba(25, 130, 255, 0.77)",
+    new: [
+      "When joining a server, the tabs should change to servers and default channel should open up.",
+      "Swapped the changelog and the explore tab."
+    ],
+    fix: [
+      'Fixed a bug where edit and delete buttons would show for all members.',
+      'Fixed a bug where when clicking on "message" in the server tab, in someones profile, the tab wouldnt change to dm.'
+    ],
+  },
   {
     version: 7.0,
     title: "Nertivia now starts up when you get on your PC!",
     shortTitle: "",
     date: "13/09/2019",
-    headColor: "rgba(25, 130, 255, 0.77)",
     new: [
       'Nertivia app now starts up when you start your pc. You can change the behaviour in the settings.',
     ],