diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 6acdae0..0aca129 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -45,7 +45,7 @@
   </div>
 </template>
 <script type="text/ecmascript-6">
-  import {mapState, mapGetters} from 'vuex';
+  import {mapGetters} from 'vuex';
 
   export default {
     data() {
@@ -55,7 +55,7 @@
     },
     methods: {
       fullReload() {
-        this.$store.dispatch('savePassword', {password: this.defaultPassword});
+        this.$store.dispatch('savePassword', {password: this.$store.state.defaultPassword});
         this.$router.push({name: 'home'});
       },
       logout() {
@@ -71,10 +71,6 @@
       }
     },
     computed: {
-      ...mapState([
-        'password',
-        'defaultPassword'
-      ]),
       ...mapGetters([
         'isAuthenticated',
         'isGuest'
diff --git a/src/store/actions.js b/src/store/actions.js
index 966aeb8..8f104cd 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -67,17 +67,18 @@ export const getPasswords = ({ commit, state }) => {
 };
 
 export const saveOrUpdatePassword = ({ commit, state }) => {
-  if (state.password && typeof state.password.id === "undefined") {
-    const site = state.password.site;
-    const login = state.password.login;
-    if (site || login) {
-      Password.create(state.password, state).then(response => {
-        savePassword({ commit }, { password: response.data });
-        getPasswords({ commit, state });
-      });
-    }
+  const site = state.password.site;
+  const login = state.password.login;
+  const existingPassword = state.passwords.find(password => {
+    return password.site === site && password.login === login;
+  });
+  if (existingPassword) {
+    const newPassword = Object.assign({}, existingPassword, state.password);
+    Password.update(newPassword, state).then(() => {
+      getPasswords({ commit, state });
+    });
   } else {
-    Password.update(state.password, state).then(() => {
+    Password.create(state.password, state).then(() => {
       getPasswords({ commit, state });
     });
   }
diff --git a/src/store/index.js b/src/store/index.js
index 75d5dcd..59a4a0f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -10,8 +10,9 @@ Vue.use(Vuex);
 
 const state = {
   authenticated: false,
-  password: defaultPassword,
+  password: Object.assign({}, defaultPassword),
   passwords: [],
+  message: "",
   defaultPassword: defaultPassword,
   showOptions: false,
   token: null,
@@ -23,5 +24,10 @@ export default new Vuex.Store({
   getters,
   actions,
   mutations,
-  plugins: [createPersistedState({ key: "lesspass" })]
+  plugins: [
+    createPersistedState({
+      key: "lesspass",
+      paths: ["token", "baseURL", "authenticated", "defaultPassword"]
+    })
+  ]
 });