diff --git a/package.json b/package.json
index 2a34343..94fabdb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "passwall-extension",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service build --mode development --watch",
diff --git a/src/mixins/list.js b/src/mixins/list.js
index 5259439..c5863c7 100644
--- a/src/mixins/list.js
+++ b/src/mixins/list.js
@@ -3,9 +3,7 @@ import { mapState } from 'vuex'
 export default {
   beforeRouteEnter(to, from, next) {
     next(vm => {
-      if (!to.params.cache) {
         vm.fetchAll()
-      }
     })
   },
   methods: {
diff --git a/src/popup/config.js b/src/popup/config.js
index 3045037..afb8684 100644
--- a/src/popup/config.js
+++ b/src/popup/config.js
@@ -33,10 +33,10 @@ import vOutsideEvents from 'vue-outside-events'
 Vue.use(vOutsideEvents)
 
 import Notifications from 'vue-notification'
-Vue.use(Notifications, { duration: 2500 })
-Vue.prototype.$notifyError    = text => Vue.prototype.$notify({ type: 'error', duration: 5000, text })
-Vue.prototype.$notifyWarn     = text => Vue.prototype.$notify({ type: 'warn', duration: 5000, text })
-Vue.prototype.$notifySuccess  = text => Vue.prototype.$notify({ type: 'success', duration: 5000, text })
+Vue.use(Notifications, { duration: 3000 })
+Vue.prototype.$notifyError = text => Vue.prototype.$notify({ type: 'error', text })
+Vue.prototype.$notifyWarn = text => Vue.prototype.$notify({ type: 'warn', text })
+Vue.prototype.$notifySuccess = text => Vue.prototype.$notify({ type: 'success', text })
 
 window.wait = new VueWait({
   registerComponent: false,
@@ -44,8 +44,8 @@ window.wait = new VueWait({
 })
 
 Vue.directive('click-outside', {
-  bind: function(el, binding, vnode) {
-    el.clickOutsideEvent = function(event) {
+  bind: function (el, binding, vnode) {
+    el.clickOutsideEvent = function (event) {
       // here I check that click was outside the el and his children
       if (!(el == event.target || el.contains(event.target))) {
         // and if it did, call method provided in attribute value
@@ -54,7 +54,7 @@ Vue.directive('click-outside', {
     }
     document.body.addEventListener('click', el.clickOutsideEvent)
   },
-  unbind: function(el) {
+  unbind: function (el) {
     document.body.removeEventListener('click', el.clickOutsideEvent)
   }
 })
@@ -65,28 +65,42 @@ requireComponent.keys().forEach(fileName => {
   Vue.component(componentConfig.default.name, componentConfig.default)
 })
 
-Vue.prototype.$request = async (callback, waitKey, errorCallback = null) => {
-  try {
-    window.wait.start(waitKey)
+Vue.prototype.$request = async (callback, waitKey, errorCallback = null, retry = false) => {
+  window.wait.start(waitKey)
+  
+  try {  
     await callback()
   } catch (error) {
-    console.log(error)
+    console.error(error)
 
-    if (error.response) {
-      if (error.response.status === 401 && !router.app._route.meta.auth) {
+    // No connection
+    if (!error.response) {
+      Vue.prototype.$notifyError('Network Error !')
+      Vue.prototype.$wait.end(waitKey)
+      return
+    }
+
+    if (error.response.status === 401 && !router.app._route.meta.auth && !retry) {
+      // Refresh token
+      try {
+        await store.dispatch('RefreshToken')
+        // Retry the connection
+        return Vue.prototype.$request(callback, waitKey, errorCallback, true)
+      } catch (refreshError) {
+        Vue.prototype.$notifyError('Authorization expired.')
+
+        // Reset all tokens
         await store.dispatch('Logout')
         return router.push({ name: 'Login' })
       }
+    }
 
-      if (errorCallback) {
-        errorCallback(error)
-      } else if (error.response.status >= 500) {
-        Vue.prototype.$notifyError(i18n.t('API500ErrorMessage'))
-      } else if (error.response.data.Message && error.response.status != 401) {
-        Vue.prototype.$notifyError(error.response.data.Message)
-      }
-    } else {
-      Vue.prototype.$notifyError('Network Error !')
+    if (errorCallback) {
+      errorCallback(error)
+    } else if (error.response.status >= 500) {
+      Vue.prototype.$notifyError(i18n.t('API500ErrorMessage'))
+    } else if (error.response.data.Message && error.response.status != 401) {
+      Vue.prototype.$notifyError(error.response.data.Message)
     }
   } finally {
     window.wait.end(waitKey)
@@ -100,7 +114,7 @@ if (
   window.screenLeft > window.screen.width ||
   window.screenTop > window.screen.height
 ) {
-  chrome.runtime.getPlatformInfo(function(info) {
+  chrome.runtime.getPlatformInfo(function (info) {
     if (info.os === 'mac') {
       const fontFaceSheet = new CSSStyleSheet()
       fontFaceSheet.insertRule(`
diff --git a/src/popup/router/index.js b/src/popup/router/index.js
index 417caf9..821f439 100644
--- a/src/popup/router/index.js
+++ b/src/popup/router/index.js
@@ -2,6 +2,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import AuthCheck from './auth-check'
 import ClearSearch from '@p/router/clear-search'
+import Storage from '@/utils/storage'
 
 Vue.use(Router)
 
@@ -119,13 +120,42 @@ const router = new Router({
   ]
 })
 
+router.afterEach((to, from) => {
+  Storage.setItem('latest_route', to.name)
+  Storage.setItem('latest_route_param_detail', to.params.detail)
+  Storage.setItem('create_form', null)
+})
+
 router.afterEach((to, from) => {
   const toDepth = to.path.split('/').length
   const fromDepth = from.path.split('/').length
   to.meta.transitionName = toDepth < fromDepth ? 'slide-right' : 'slide-left'
 })
+
 router.afterEach(ClearSearch)
 
 router.beforeEach(AuthCheck)
 
+let isFirstTransition = true;
+router.beforeEach(async (to, from, next) => {
+  const lastRouteName = await Storage.getItem('latest_route')
+  const detail = await Storage.getItem('latest_route_param_detail')
+  const shouldRedirect = Boolean(
+    to.name === "Logins" && lastRouteName && isFirstTransition
+  )
+
+  if (shouldRedirect) {
+    if (lastRouteName.search("Detail") > -1) {
+      next({ name: lastRouteName, params: { detail, id: detail.id } })
+    } else {
+      next({ name: lastRouteName })
+    }
+  } else {
+    next()
+  }
+
+  isFirstTransition = false
+
+})
+
 export default router
diff --git a/src/popup/store/index.js b/src/popup/store/index.js
index 442fe0f..eee6c75 100644
--- a/src/popup/store/index.js
+++ b/src/popup/store/index.js
@@ -44,6 +44,27 @@ export default new Vuex.Store({
       state.master_hash = await Storage.getItem('master_hash')
     },
 
+    async RefreshToken({ state }, payload) {
+
+      var token = await Storage.getItem('refresh_token')
+      const { data } = await AuthService.Refresh({refresh_token:token})
+      
+      state.access_token = data.access_token
+      state.refresh_token = data.refresh_token
+      state.transmission_key = data.transmission_key.substr(0, 32)
+      CryptoUtils.transmissionKey = state.transmission_key
+
+      // P.S.: Because we don't have a payload, we didn't update the master hash
+      
+      await Promise.all([
+        Storage.setItem('access_token', data.access_token),
+        Storage.setItem('refresh_token', data.refresh_token),
+        Storage.setItem('transmission_key', state.transmission_key)
+      ])
+
+      HTTPClient.setHeader('Authorization', `Bearer ${state.access_token}`)
+    },
+
     async Login({ state }, payload) {
       payload.master_password = CryptoUtils.sha256Encrypt(payload.master_password)
 
@@ -72,6 +93,7 @@ export default new Vuex.Store({
 
     async Logout({ state }) {
       const email = await Storage.getItem('email')
+      const server = await Storage.getItem('server')
       await Storage.clear()
       state.access_token = null
       state.refresh_token = null
@@ -79,6 +101,7 @@ export default new Vuex.Store({
       state.master_hash = null
       state.user = null
       await Storage.setItem('email', email)
+      await Storage.setItem('server', server)
     },
     async loadStore({ state }) {
       state.user = await Storage.getItem('user')
diff --git a/src/popup/views/BankAccounts/create.vue b/src/popup/views/BankAccounts/create.vue
index 621d9a3..d23c654 100644
--- a/src/popup/views/BankAccounts/create.vue
+++ b/src/popup/views/BankAccounts/create.vue
@@ -16,7 +16,8 @@
         <div class="form-row">
           <label v-text="'Title'" />
           <VFormText
-            name="Title"
+            name="title"
+            v-on:change="saveForm"
             v-model="form.title"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -28,6 +29,7 @@
           <label v-text="'Account Name'" />
           <VFormText
             name="account name"
+            v-on:change="saveForm"
             v-model="form.account_name"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -39,6 +41,7 @@
           <label v-text="'Account Number'" />
           <VFormText
             name="account number"
+            v-on:change="saveForm"
             v-model="form.account_number"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -50,6 +53,7 @@
           <label v-text="'IBAN'" />
           <VFormText
             name="iban"
+            v-on:change="saveForm"
             v-model="form.iban"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -61,6 +65,7 @@
           <label v-text="'Currency'" />
           <VFormText
             name="currency"
+            v-on:change="saveForm"
             v-model="form.currency"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -73,6 +78,7 @@
           <div class="d-flex flex-justify-between ">
             <VFormText
               name="Password"
+              v-on:change="saveForm"
               class="flex-auto"
               v-model="form.password"
               v-validate="'required'"
@@ -103,6 +109,7 @@
 
 <script>
 import { mapActions } from 'vuex'
+import Storage from '@/utils/storage'
 
 export default {
   data() {
@@ -118,6 +125,12 @@ export default {
       }
     }
   },
+  async created() {
+    const storageFormData = await Storage.getItem('create_form')
+    if (storageFormData !== null) {
+      this.form = storageFormData
+    }
+  },
   methods: {
     ...mapActions('BankAccounts', ['Create']),
     async onSubmit() {
@@ -127,6 +140,10 @@ export default {
         this.$router.push({ name: 'BankAccounts' })
       }
       this.$request(onSuccess, this.$waiters.BankAccounts.Create)
+    },
+    
+    saveForm: function (event) {
+      Storage.setItem('create_form', this.form)
     }
   }
 }
diff --git a/src/popup/views/CreditCards/create.vue b/src/popup/views/CreditCards/create.vue
index b7891c8..6b08185 100644
--- a/src/popup/views/CreditCards/create.vue
+++ b/src/popup/views/CreditCards/create.vue
@@ -17,6 +17,7 @@
           <label v-text="'Title'" />
           <VFormText
             name="Title"
+            v-on:change="saveForm"
             v-model="form.title"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -28,6 +29,7 @@
           <label v-text="'Card Holder Name'" />
           <VFormText
             name="Card Holder Name"
+            v-on:change="saveForm"
             v-model="form.cardholder_name"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -39,6 +41,7 @@
           <label v-text="'Type'" />
           <VFormText
             name="Type"
+            v-on:change="saveForm"
             v-model="form.type"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -50,6 +53,7 @@
           <label v-text="'Number'" />
           <VFormText
             name="Number"
+            v-on:change="saveForm"
             v-model="form.number"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -61,6 +65,7 @@
           <label v-text="'Expiration Date'" />
           <VFormText
             name="Expiration Date"
+            v-on:change="saveForm"
             v-model="form.expiry_date"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -72,6 +77,7 @@
           <div class="d-flex flex-justify-between ">
             <VFormText
               name="Verification Number"
+              v-on:change="saveForm"
               class="flex-auto"
               v-model="form.verification_number"
               v-validate="'required'"
@@ -102,6 +108,7 @@
 
 <script>
 import { mapActions } from 'vuex'
+import Storage from '@/utils/storage'
 
 export default {
   data() {
@@ -117,6 +124,12 @@ export default {
       }
     }
   },
+  async created() {
+    const storageFormData = await Storage.getItem('create_form')
+    if (storageFormData !== null) {
+      this.form = storageFormData
+    }
+  },
   methods: {
     ...mapActions('CreditCards', ['Create']),
     async onSubmit() {
@@ -126,6 +139,10 @@ export default {
         this.$router.push({ name: 'CreditCards' })
       }
       this.$request(onSuccess, this.$waiters.CreditCards.Create)
+    },
+    
+    saveForm: function (event) {
+      Storage.setItem('create_form', this.form)
     }
   }
 }
diff --git a/src/popup/views/Emails/create.vue b/src/popup/views/Emails/create.vue
index f48c79e..26b429d 100644
--- a/src/popup/views/Emails/create.vue
+++ b/src/popup/views/Emails/create.vue
@@ -17,6 +17,7 @@
           <label v-text="'Title'" />
           <VFormText
             name="Title"
+            v-on:change="saveForm"
             v-model="form.title"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -28,6 +29,7 @@
           <label v-text="'Email'" />
           <VFormText
             name="Email"
+            v-on:change="saveForm"
             v-model="form.email"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -40,6 +42,7 @@
           <div class="d-flex flex-justify-between ">
             <VFormText
               name="Password"
+              v-on:change="saveForm"
               class="flex-auto"
               v-model="form.password"
               v-validate="'required'"
@@ -73,6 +76,7 @@
 
 <script>
 import { mapActions } from 'vuex'
+import Storage from '@/utils/storage'
 
 export default {
   data() {
@@ -85,6 +89,12 @@ export default {
       }
     }
   },
+  async created() {
+    const storageFormData = await Storage.getItem('create_form')
+    if (storageFormData !== null) {
+      this.form = storageFormData
+    }
+  },
   methods: {
     ...mapActions('Emails', ['Create']),
     async onSubmit() {
@@ -94,6 +104,10 @@ export default {
         this.$router.push({ name: 'Emails' })
       }
       this.$request(onSuccess, this.$waiters.Emails.Create)
+    },
+    
+    saveForm: function (event) {
+      Storage.setItem('create_form', this.form)
     }
   }
 }
diff --git a/src/popup/views/Home/index.vue b/src/popup/views/Home/index.vue
index 71da9fd..85dc681 100644
--- a/src/popup/views/Home/index.vue
+++ b/src/popup/views/Home/index.vue
@@ -74,9 +74,6 @@ export default {
       showSettings: false
     }
   },
-  created() {
-    console.log(this.hasProPlan)
-  },
   computed: {
     ...mapState(['searchQuery', 'user']),
     ...mapGetters(['hasProPlan'])
@@ -93,7 +90,7 @@ export default {
 
     goUpgrade() {
       this.$browser.tabs.create({
-        url: 'https://signup.passwall.io/pro'
+        url: 'https://signup.passwall.io/upgrade'
       })
     },
 
diff --git a/src/popup/views/Logins/create.vue b/src/popup/views/Logins/create.vue
index 87c3249..14c0393 100644
--- a/src/popup/views/Logins/create.vue
+++ b/src/popup/views/Logins/create.vue
@@ -17,6 +17,7 @@
           <label v-text="'Title'" />
           <VFormText
             name="Title"
+            v-on:change="saveForm"
             v-model="form.title"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -28,6 +29,7 @@
           <label v-text="'Username'" />
           <VFormText
             name="Username"
+            v-on:change="saveForm"
             v-model="form.username"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -41,6 +43,7 @@
             <VFormText
               name="Password"
               class="flex-auto"
+              v-on:change="saveForm"
               v-model="form.password"
               v-validate="'required'"
               :placeholder="$t('ClickToFill')"
@@ -62,6 +65,7 @@
             <VFormText
               name="Web Site"
               class="flex-auto"
+              v-on:change="saveForm"
               v-model="form.url"
               v-validate="'required'"
               :placeholder="$t('ClickToFill')"
@@ -74,6 +78,7 @@
         <div>
           <VTextArea 
             :placeholder="$t('ClickToFill')" 
+            v-on:change="saveForm"
             v-model="form.extra" 
             label="Extra" 
             name="extra" 
@@ -98,6 +103,7 @@
 <script>
 import CheckPassword from '@/components/CheckPassword.vue';
 import { mapActions } from 'vuex'
+import Storage from '@/utils/storage'
 
 export default {
   components: { CheckPassword },
@@ -113,11 +119,16 @@ export default {
       }
     }
   },
-  created() {
-    this.$browser.tabs.query({ active: true, currentWindow: true }).then(tabs => {
-      this.form.title = tabs[0].title
-      this.form.url   = tabs[0].url
-    });
+  async created() {
+    const storageFormData = await Storage.getItem('create_form')
+    if (storageFormData === null) {
+      this.$browser.tabs.query({ active: true, currentWindow: true }).then(tabs => {
+        this.form.title = tabs[0].title
+        this.form.url   = tabs[0].url
+      })
+    } else {
+      this.form = storageFormData
+    }
   },
   methods: {
     ...mapActions('Logins', ['Create']),
@@ -128,6 +139,10 @@ export default {
         this.$router.push({ name: 'Logins' })
       }
       this.$request(onSuccess, this.$waiters.Logins.Create)
+    },
+    
+    saveForm: function (event) {
+      Storage.setItem('create_form', this.form)
     }
   }
 }
diff --git a/src/popup/views/Notes/create.vue b/src/popup/views/Notes/create.vue
index 8269502..09fba26 100644
--- a/src/popup/views/Notes/create.vue
+++ b/src/popup/views/Notes/create.vue
@@ -17,6 +17,7 @@
           <label v-text="'Title'" />
           <VFormText
             name="Title"
+            v-on:change="saveForm"
             v-model="form.title"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -26,10 +27,11 @@
 
         <div>
           <VTextArea
+            name="note"
+            v-on:change="saveForm"
             :placeholder="$t('ClickToFill')"
             v-model="form.note"
             label="Note"
-            name="note"
             isEditable
           />
         </div>
@@ -50,6 +52,7 @@
 
 <script>
 import { mapActions } from 'vuex'
+import Storage from '@/utils/storage'
 
 export default {
   data() {
@@ -61,6 +64,12 @@ export default {
       }
     }
   },
+  async created() {
+    const storageFormData = await Storage.getItem('create_form')
+    if (storageFormData !== null) {
+      this.form = storageFormData
+    }
+  },
   methods: {
     ...mapActions('Notes', ['Create']),
     async onSubmit() {
@@ -70,6 +79,10 @@ export default {
         this.$router.push({ name: 'Notes' })
       }
       this.$request(onSuccess, this.$waiters.Notes.Create)
+    },
+    
+    saveForm: function (event) {
+      Storage.setItem('create_form', this.form)
     }
   }
 }
diff --git a/src/popup/views/Servers/create.vue b/src/popup/views/Servers/create.vue
index 97f4ca8..24fde4e 100644
--- a/src/popup/views/Servers/create.vue
+++ b/src/popup/views/Servers/create.vue
@@ -17,6 +17,7 @@
           <label v-text="'Title'" />
           <VFormText
             name="Title"
+            v-on:change="saveForm"
             v-model="form.title"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -28,6 +29,7 @@
           <label v-text="'IP Address'" />
           <VFormText
             name="IP Address"
+            v-on:change="saveForm"
             v-model="form.ip"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -39,6 +41,7 @@
           <label v-text="'Username'" />
           <VFormText
             name="Username"
+            v-on:change="saveForm"
             v-model="form.username"
             v-validate="'required'"
             :placeholder="$t('ClickToFill')"
@@ -51,6 +54,7 @@
           <div class="d-flex flex-justify-between ">
             <VFormText
               name="Password"
+              v-on:change="saveForm"
               class="flex-auto"
               v-model="form.password"
               v-validate="'required'"
@@ -72,6 +76,7 @@
           <div class="d-flex flex-justify-between">
             <VFormText
               name="Web Site"
+              v-on:change="saveForm"
               class="flex-auto"
               v-model="form.url"
               v-validate="'required'"
@@ -87,6 +92,7 @@
           <div class="d-flex flex-justify-between">
             <VFormText
               name="Hosting Username"
+              v-on:change="saveForm"
               class="flex-auto"
               v-model="form.hosting_username"
               v-validate="'required'"
@@ -101,6 +107,7 @@
           <div class="d-flex flex-justify-between ">
             <VFormText
               name="Hosting Password"
+              v-on:change="saveForm"
               class="flex-auto"
               v-model="form.hosting_password"
               v-validate="'required'"
@@ -122,6 +129,7 @@
           <div class="d-flex flex-justify-between">
             <VFormText
               name="Admin Username"
+              v-on:change="saveForm"
               class="flex-auto"
               v-model="form.admin_username"
               v-validate="'required'"
@@ -136,6 +144,7 @@
           <div class="d-flex flex-justify-between ">
             <VFormText
               name="Admin Password"
+              v-on:change="saveForm"
               class="flex-auto"
               v-model="form.admin_password"
               v-validate="'required'"
@@ -154,10 +163,11 @@
 
         <div>
           <VTextArea 
+            name="extra"
+            v-on:change="saveForm"
             :placeholder="$t('ClickToFill')" 
             v-model="form.extra" 
             label="Extra" 
-            name="extra"
             isEditable
           />
         </div>
@@ -179,6 +189,7 @@
 
 <script>
 import { mapActions } from 'vuex'
+import Storage from '@/utils/storage'
 
 export default {
   data() {
@@ -199,6 +210,12 @@ export default {
       }
     }
   },
+  async created() {
+    const storageFormData = await Storage.getItem('create_form')
+    if (storageFormData !== null) {
+      this.form = storageFormData
+    }
+  },
   methods: {
     ...mapActions('Servers', ['Create']),
     async onSubmit() {
@@ -208,6 +225,10 @@ export default {
         this.$router.push({ name: 'Servers' })
       }
       this.$request(onSuccess, this.$waiters.Servers.Create)
+    },
+    
+    saveForm: function (event) {
+      Storage.setItem('create_form', this.form)
     }
   }
 }