diff --git a/package-lock.json b/package-lock.json
index 36e9f017..377990f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15442,6 +15442,11 @@
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
       "dev": true
     },
+    "shvl": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/shvl/-/shvl-1.3.1.tgz",
+      "integrity": "sha512-+rRPP46hloYUAEImJcqprUgXu+05Ikqr4h4V+w5i2zJy37nAqtkQKufs3+3S2fDq6JNRrHMIQhB/Vaex+jgAAw=="
+    },
     "sigmund": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
@@ -17508,6 +17513,15 @@
       "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.1.tgz",
       "integrity": "sha512-ER5moSbLZuNSMBFnEBVGhQ1uCBNJslH9W/Dw2W7GZN23UQA69uapP5GTT9Vm8Trc0PzBSVt6LzF3hGjmv41xcg=="
     },
+    "vuex-persistedstate": {
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-2.5.4.tgz",
+      "integrity": "sha512-XYJhKIwO+ZVlTaXyxKxnplrJ88Fnvk5aDw753bxzRw5/yMKLQ6lq9CDCBex2fwZaQcLibhtgJOxGCHjy9GLSlQ==",
+      "requires": {
+        "deepmerge": "^2.1.0",
+        "shvl": "^1.3.0"
+      }
+    },
     "w3c-hr-time": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
diff --git a/package.json b/package.json
index 5214a521..dab6c2d5 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
     "vue-router": "^3.0.3",
     "vuelidate": "^0.7.4",
     "vuex": "^3.0.1",
+    "vuex-persistedstate": "^2.5.4",
     "whatwg-fetch": "^3.0.0"
   },
   "devDependencies": {
diff --git a/src/auth.js b/src/auth.js
index 78f2c0fc..435b3129 100644
--- a/src/auth.js
+++ b/src/auth.js
@@ -2,48 +2,29 @@ import SdkAuth, { TokenProvider } from '@commercetools/sdk-auth';
 import store from './store';
 import config from '../sunrise.config';
 
-const tokenInfoStorageName = 'token';
-const isAuthenticatedStorageName = 'auth';
-let storedTokenInfo;
-
-try {
-  storedTokenInfo = JSON.parse(localStorage.getItem(tokenInfoStorageName));
-  const isAuthenticated = localStorage.getItem(isAuthenticatedStorageName);
-  if (storedTokenInfo && isAuthenticated) {
-    store.dispatch('setAuthenticated', true);
-  }
-} catch (error) {
-  // eslint-disable-next-line no-console
-  console.error('Could not retrieve token from local storage', error);
-}
-
 const tokenProvider = new TokenProvider({
   sdkAuth: new SdkAuth(config.ct.auth),
   fetchTokenInfo: sdkAuth => sdkAuth.anonymousFlow(),
-  onTokenInfoChanged: tokenInfo => localStorage.setItem(tokenInfoStorageName, JSON.stringify(tokenInfo)),
-}, storedTokenInfo);
+  onTokenInfoChanged: tokenInfo => store.dispatch('setTokenInfo', tokenInfo),
+}, store.state.tokenInfo);
 
 export function cleanUpSession() {
   tokenProvider.invalidateTokenInfo();
-  localStorage.removeItem(tokenInfoStorageName);
-  localStorage.removeItem(isAuthenticatedStorageName);
-  return store.dispatch('setAuthenticated', false);
+  return store.dispatch('clearAuthentication');
 }
 
 export function clientLogin(apolloClient, credentials) {
-  localStorage.removeItem(tokenInfoStorageName);
-  tokenProvider.fetchTokenInfo = sdkAuth => sdkAuth.customerPasswordFlow(credentials);
-  tokenProvider.invalidateTokenInfo();
-  return apolloClient.resetStore()
-    .then(() => {
-      localStorage.setItem(isAuthenticatedStorageName, true);
-      return store.dispatch('setAuthenticated', true);
-    })
-    .catch((error) => {
-      // eslint-disable-next-line no-console
-      console.error('Error on cache reset during login', error);
-      return cleanUpSession();
-    });
+  return store.dispatch('clearAuthentication').then(() => {
+    tokenProvider.fetchTokenInfo = sdkAuth => sdkAuth.customerPasswordFlow(credentials);
+    tokenProvider.invalidateTokenInfo();
+    return apolloClient.resetStore()
+      .then(() => store.dispatch('setAuthenticated', true))
+      .catch((error) => {
+        // eslint-disable-next-line no-console
+        console.error('Error on cache reset during login', error);
+        return cleanUpSession();
+      });
+  });
 }
 
 export function clientLogout(apolloClient, redirect) {
diff --git a/src/components/cartdetail/PageCartDetail.vue b/src/components/cartdetail/PageCartDetail.vue
index d25a5ac3..1ff49ff3 100644
--- a/src/components/cartdetail/PageCartDetail.vue
+++ b/src/components/cartdetail/PageCartDetail.vue
@@ -144,7 +144,7 @@ export default {
         ${DisplayableMoneyFragment}`,
       variables() {
         return {
-          locale: this.$i18n.locale,
+          locale: this.$store.state.locale,
         };
       },
     },
diff --git a/src/components/common/Breadcrumb.vue b/src/components/common/Breadcrumb.vue
index ec004843..08ffac7c 100644
--- a/src/components/common/Breadcrumb.vue
+++ b/src/components/common/Breadcrumb.vue
@@ -61,8 +61,8 @@ export default {
         }`,
       variables() {
         return {
-          locale: this.$i18n.locale,
-          where: `slug(${this.$i18n.locale}="${this.categorySlug}")`,
+          locale: this.$store.state.locale,
+          where: `slug(${this.$store.state.locale}="${this.categorySlug}")`,
         };
       },
       skip: vm => !vm.categorySlug,
diff --git a/src/components/common/ProductThumbnail.vue b/src/components/common/ProductThumbnail.vue
index 38fd7ffb..3a8f0d2b 100644
--- a/src/components/common/ProductThumbnail.vue
+++ b/src/components/common/ProductThumbnail.vue
@@ -86,15 +86,10 @@
 </template>
 
 <script>
-import priceMixin from '@/mixins/priceMixin';
 import productMixin from '@/mixins/productMixin';
 import BasePrice from './BasePrice.vue';
 
 export default {
-  components: {
-    BasePrice,
-  },
-
   props: {
     product: {
       type: Object,
@@ -102,6 +97,12 @@ export default {
     },
   },
 
+  components: {
+    BasePrice,
+  },
+
+  mixins: [productMixin],
+
   computed: {
     matchingVariant() {
       // with query endpoint we cannot really determine
@@ -121,8 +122,6 @@ export default {
       return Array.isArray(this.matchingVariant.images) && this.matchingVariant.images.length > 0;
     },
   },
-
-  mixins: [priceMixin, productMixin],
 };
 </script>
 
diff --git a/src/components/header/CategoriesMenu.vue b/src/components/header/CategoriesMenu.vue
index f271d528..f5580a69 100644
--- a/src/components/header/CategoriesMenu.vue
+++ b/src/components/header/CategoriesMenu.vue
@@ -117,7 +117,7 @@ export default {
         }`,
       variables() {
         return {
-          locale: this.$i18n.locale,
+          locale: this.$store.state.locale,
         };
       },
     },
diff --git a/src/components/header/LocationSelector.vue b/src/components/header/LocationSelector.vue
index 71a84fb7..1d3882b7 100644
--- a/src/components/header/LocationSelector.vue
+++ b/src/components/header/LocationSelector.vue
@@ -1,28 +1,29 @@
 <template>
   <li v-if="languages.length"
-      @mouseleave="setCloseTimer"
-      @mouseenter="clearCloseTimer"
+      @mouseleave="open"
+      @mouseenter="close"
       data-test="location-selector"
       class="list-item-location clearfix">
-    <button @click="show = !show"
+    <button @click="toggle"
             data-test="location-selector-open-button">
       <img class="pull-right"
            src="../../assets/img/globe-2.png"
-           :alt="$t('main.header.location')">
+           :alt="$t('location')">
     </button>
     <transition name="fade">
       <div v-if="show"
            class="location-dropdown">
-        <!--{{#if location.language}}-->
-        <span class="location-dropdown-label">
-        {{ $t("main.header.language") }}
-        </span>
-        <SelectBoxIt v-model="$i18n.locale"
-                     :options="languages"
-                     id="language"
-                     data-test="location-selector-dropdown"
-                     class="select location-select"/>
-        <!--{{/if}}-->
+        <div v-if="languages.length">
+          <span class="location-dropdown-label">
+            {{ $t('language') }}
+          </span>
+          <SelectBoxIt v-model="language"
+                       :options="languages"
+                       id="language"
+                       data-test="location-selector-dropdown"
+                       class="select location-select"
+                       @input="toggle"/>
+        </div>
         <!--{{#if location.country}}-->
         <!--<form id="form-select-country" action="{{@root.meta._links.selectCountry.href}}" method="POST">-->
         <!--<input type="hidden" name="csrfToken" value="{{@root.meta.csrfToken}}"/>-->
@@ -52,6 +53,15 @@ export default {
   }),
 
   computed: {
+    language: {
+      get() {
+        return this.$store.state.locale;
+      },
+      set(value) {
+        this.$store.dispatch('setLocale', value);
+      },
+    },
+
     languages() {
       const configLangs = this.$sunrise.languages;
       const langs = configLangs ? Object.entries(configLangs) : [];
@@ -60,15 +70,30 @@ export default {
   },
 
   methods: {
-    setCloseTimer() {
+    toggle() {
+      this.show = !this.show;
+    },
+
+    open() {
       this.closeTimer = setTimeout(() => {
         this.show = false;
       }, 300);
     },
 
-    clearCloseTimer() {
+    close() {
       clearTimeout(this.closeTimer);
     },
   },
 };
 </script>
+
+<i18n>
+en:
+  location: "Location"
+  language: "Language"
+  country: "Country"
+de:
+  location: "Ort"
+  language: "Sprache"
+  country: "Land"
+</i18n>
diff --git a/src/components/header/MiniCart.vue b/src/components/header/MiniCart.vue
index c70ed791..a02f2f58 100644
--- a/src/components/header/MiniCart.vue
+++ b/src/components/header/MiniCart.vue
@@ -62,7 +62,6 @@ import Vue from 'vue';
 import gql from 'graphql-tag';
 import VuePerfectScrollbar from 'vue-perfect-scrollbar';
 import cartMixin from '@/mixins/cartMixin';
-import priceMixin from '@/mixins/priceMixin';
 import productMixin from '@/mixins/productMixin';
 import DisplayableMoneyFragment from '@/components/DisplayableMoney.gql';
 import BaseMoney from '../common/BaseMoney.vue';
@@ -77,7 +76,7 @@ export default {
     VuePerfectScrollbar,
   },
 
-  mixins: [cartMixin, priceMixin, productMixin],
+  mixins: [cartMixin, productMixin],
 
   data: () => ({
     me: null,
@@ -142,7 +141,7 @@ export default {
         ${DisplayableMoneyFragment}`,
       variables() {
         return {
-          locale: this.$i18n.locale,
+          locale: this.$store.state.locale,
         };
       },
     },
diff --git a/src/components/home/BannerPicture.vue b/src/components/home/BannerPicture.vue
index 1b9fe0a4..54d2a0c2 100644
--- a/src/components/home/BannerPicture.vue
+++ b/src/components/home/BannerPicture.vue
@@ -14,7 +14,7 @@ export default {
     src() {
       try {
         // eslint-disable-next-line import/no-dynamic-require, global-require
-        return require(`@/assets/img/banners/${this.$i18n.locale}/${this.file}`);
+        return require(`@/assets/img/banners/${this.$store.state.locale}/${this.file}`);
       } catch (e) {
         // eslint-disable-next-line import/no-dynamic-require, global-require
         return require(`@/assets/img/banners/${this.file}`);
diff --git a/src/components/productdetail/AddToCartForm.vue b/src/components/productdetail/AddToCartForm.vue
index 62911ca4..0d86f775 100644
--- a/src/components/productdetail/AddToCartForm.vue
+++ b/src/components/productdetail/AddToCartForm.vue
@@ -41,7 +41,6 @@
 <script>
 import { required, numeric, between } from 'vuelidate/lib/validators';
 import cartMixin from '../../mixins/cartMixin';
-import priceMixin from '../../mixins/priceMixin';
 import ServerError from '../common/form/ServerError.vue';
 import LoadingButton from '../common/form/LoadingButton.vue';
 import BaseSelect from '../common/form/BaseSelect.vue';
@@ -64,7 +63,7 @@ export default {
     ServerError,
   },
 
-  mixins: [cartMixin, priceMixin],
+  mixins: [cartMixin],
 
   data: () => ({
     form: {
@@ -82,7 +81,9 @@ export default {
     async addLineItem() {
       if (!this.cartExists) {
         await this.createMyCart({
-          currency: this.currency,
+          currency: this.$store.state.currency,
+          country: this.$store.state.country,
+          shippingAddress: { country: this.$store.state.country },
         });
       }
       return this.updateMyCart({
diff --git a/src/components/productdetail/DetailsSection.vue b/src/components/productdetail/DetailsSection.vue
index a23d79fc..b5eaf335 100644
--- a/src/components/productdetail/DetailsSection.vue
+++ b/src/components/productdetail/DetailsSection.vue
@@ -177,7 +177,7 @@ export default {
         }`,
       variables() {
         return {
-          locale: this.$i18n.locale,
+          locale: this.$store.state.locale,
           sku: this.sku,
         };
       },
diff --git a/src/components/productdetail/ProductInfo.vue b/src/components/productdetail/ProductInfo.vue
index 5167968d..87a64ac6 100644
--- a/src/components/productdetail/ProductInfo.vue
+++ b/src/components/productdetail/ProductInfo.vue
@@ -57,7 +57,6 @@
 
 <script>
 import gql from 'graphql-tag';
-import priceMixin from '@/mixins/priceMixin';
 import productMixin from '@/mixins/productMixin';
 import ProductGallery from './ProductGallery.vue';
 import SocialMediaLinks from './SocialMediaLinks.vue';
@@ -91,7 +90,7 @@ export default {
     },
   },
 
-  mixins: [priceMixin, productMixin],
+  mixins: [productMixin],
 
   apollo: {
     product: {
@@ -126,8 +125,8 @@ export default {
         }`,
       variables() {
         return {
-          locale: this.$i18n.locale,
-          currency: this.currency,
+          locale: this.$store.state.locale,
+          currency: this.$store.state.currency,
           sku: this.sku,
         };
       },
diff --git a/src/components/productoverview/ProductList.vue b/src/components/productoverview/ProductList.vue
index d748310f..63a011a5 100644
--- a/src/components/productoverview/ProductList.vue
+++ b/src/components/productoverview/ProductList.vue
@@ -98,7 +98,7 @@ export default {
         }`,
       variables() {
         return {
-          where: `slug(${this.$i18n.locale}="${this.categorySlug}")`,
+          where: `slug(${this.$store.state.locale}="${this.categorySlug}")`,
         };
       },
       skip: vm => !vm.categorySlug,
@@ -142,7 +142,7 @@ export default {
         }`,
       variables() {
         return {
-          locale: this.$i18n.locale,
+          locale: this.$store.state.locale,
           currency: this.$i18n.numberFormats[this.$store.state.country].currency.currency,
           where: `masterData(current(categories(id="${this.category.id}")))`,
           sort: this.sort,
diff --git a/src/components/useraccount/myorders/TabOrderDetail.vue b/src/components/useraccount/myorders/TabOrderDetail.vue
index 5f60e794..a24be94e 100644
--- a/src/components/useraccount/myorders/TabOrderDetail.vue
+++ b/src/components/useraccount/myorders/TabOrderDetail.vue
@@ -132,7 +132,7 @@ export default {
       variables() {
         return {
           orderNumber: this.orderNumber,
-          locale: this.$i18n.locale,
+          locale: this.$store.state.locale,
         };
       },
     },
diff --git a/src/i18n/i18n.js b/src/i18n/i18n.js
index 731da695..9168aad7 100644
--- a/src/i18n/i18n.js
+++ b/src/i18n/i18n.js
@@ -1,11 +1,10 @@
 import Vue from 'vue';
 import VueI18n from 'vue-i18n';
+import store, { fallbackLocale } from '../store';
 import sunriseConfig from '../../sunrise.config';
 
 Vue.use(VueI18n);
 
-const fallbackLocale = sunriseConfig.languages ? Object.keys(sunriseConfig.languages)[0] : 'en';
-
 function loadMessages() {
   const locales = require.context('@/i18n', true, /[a-z0-9]+\.yaml$/i);
   const messages = {};
@@ -19,54 +18,17 @@ function loadMessages() {
   return messages;
 }
 
-function findInitialLocale() {
-  const storedLocale = localStorage.getItem('locale');
-  return storedLocale || fallbackLocale;
-}
-
-const numberFormats = {
-  'en-US': {
-    currency: {
-      style: 'currency', currency: 'USD'
-    }
-  },
-  'de-DE': {
-    currency: {
-      style: 'currency', currency: 'EUR', currencyDisplay: 'symbol'
-    }
-  }
-};
-
-const dateTimeFormats = {
-  'en-US': {
-    short: {
-      year: 'numeric',
-      month: 'short',
-      day: 'numeric'
-    }
-  },
-
-  'de-DE': {
-    short: {
-      year: 'numeric',
-      month: 'short',
-      day: 'numeric'
-    }
-  }
-};
-
-// Create VueI18n instance with options
 const i18n = new VueI18n({
-  locale: findInitialLocale(),
+  locale: store.state.locale,
   fallbackLocale,
   messages: loadMessages(),
-  numberFormats,
-  dateTimeFormats,
+  numberFormats: sunriseConfig.formats.number,
+  dateTimeFormats: sunriseConfig.formats.datetime,
 });
 
-i18n.vm.$watch('locale', (locale) => {
-  document.documentElement.lang = locale;
-  localStorage.setItem('locale', locale);
+store.watch((state) => state.locale, (value) => {
+  i18n.locale = value;
+  document.documentElement.lang = value;
 });
 
 export default i18n;
\ No newline at end of file
diff --git a/src/mixins/cartMixin.js b/src/mixins/cartMixin.js
index a7c8b6e7..fdb3512c 100644
--- a/src/mixins/cartMixin.js
+++ b/src/mixins/cartMixin.js
@@ -108,7 +108,7 @@ export default {
           actions,
           id: this.me.activeCart?.id,
           version: this.me.activeCart?.version,
-          locale: this.$i18n.locale,
+          locale: this.$store.state.locale,
         },
       });
     },
diff --git a/src/mixins/priceMixin.js b/src/mixins/priceMixin.js
deleted file mode 100644
index 4608720d..00000000
--- a/src/mixins/priceMixin.js
+++ /dev/null
@@ -1,20 +0,0 @@
-const numberFormats = {
-  'en-US': {
-    currency: {
-      style: 'currency', currency: 'USD',
-    },
-  },
-  'de-DE': {
-    currency: {
-      style: 'currency', currency: 'EUR', currencyDisplay: 'symbol',
-    },
-  },
-};
-
-export default {
-  computed: {
-    currency() {
-      return numberFormats[this.$store.state.country].currency.currency;
-    },
-  },
-};
diff --git a/src/store.js b/src/store.js
index 6b8cce93..6b90277e 100644
--- a/src/store.js
+++ b/src/store.js
@@ -1,11 +1,24 @@
 import Vue from 'vue';
 import Vuex from 'vuex';
+import createPersistedState from 'vuex-persistedstate';
+import sunriseConfig from '../sunrise.config';
 
 Vue.use(Vuex);
 
+const SET_LOCALE = 'SET_LOCALE';
+const SET_COUNTRY = 'SET_COUNTRY';
+const SET_CURRENCY = 'SET_CURRENCY';
 const SET_AUTHENTICATED = 'SET_AUTHENTICATED';
+const SET_TOKEN_INFO = 'SET_TOKEN_INFO';
 const SET_MINI_CART_OPEN = 'SET_MINI_CART_OPEN';
 
+const availableLocales = Object.keys(sunriseConfig.languages);
+const availableCountries = Object.keys(sunriseConfig.countries);
+
+export const fallbackLocale = availableLocales[0];
+const fallbackCountry = availableCountries[0];
+const obtainCurrency = country => sunriseConfig.formats.number[country]?.currency?.currency;
+
 const clearMiniCartTimeout = (state) => {
   if (state.miniCartCloseTimer !== 0) {
     clearTimeout(state.miniCartCloseTimer);
@@ -17,20 +30,42 @@ const setMiniCartTimeout = (commit, state, timeout) => {
 };
 
 export default new Vuex.Store({
+  plugins: [createPersistedState({
+    key: 'session',
+    paths: ['locale', 'country', 'currency', 'tokenInfo', 'authenticated'],
+  })],
+
   state: {
-    country: 'de-DE',
+    locale: fallbackLocale,
+    country: fallbackCountry,
+    currency: obtainCurrency(fallbackCountry),
+    tokenInfo: null,
     authenticated: false,
     miniCartOpen: false,
     miniCartCloseTimer: 0,
   },
 
-  getters: {
+  actions: {
+    setLocale: ({ commit }, locale) => {
+      if (availableLocales.includes(locale)) commit(SET_LOCALE, locale);
+    },
 
-  },
+    setCountry: ({ commit }, country) => {
+      if (availableCountries.includes(country)) {
+        commit(SET_COUNTRY, country);
+        commit(SET_CURRENCY, obtainCurrency(country));
+      }
+    },
 
-  actions: {
     setAuthenticated: ({ commit }, authenticated) => commit(SET_AUTHENTICATED, authenticated),
 
+    setTokenInfo: ({ commit }, tokenInfo) => commit(SET_TOKEN_INFO, tokenInfo),
+
+    clearAuthentication: ({ commit }) => {
+      commit(SET_TOKEN_INFO, null);
+      commit(SET_AUTHENTICATED, false);
+    },
+
     openMiniCart: ({ commit, state }, timeout = 2000) => {
       clearMiniCartTimeout(state);
       commit(SET_MINI_CART_OPEN, true);
@@ -52,10 +87,26 @@ export default new Vuex.Store({
   },
 
   mutations: {
+    [SET_COUNTRY](state, country) {
+      state.country = country;
+    },
+
+    [SET_CURRENCY](state, currency) {
+      state.currency = currency;
+    },
+
+    [SET_LOCALE](state, locale) {
+      state.locale = locale;
+    },
+
     [SET_AUTHENTICATED](state, authenticated) {
       state.authenticated = authenticated;
     },
 
+    [SET_TOKEN_INFO](state, tokenInfo) {
+      state.tokenInfo = tokenInfo;
+    },
+
     [SET_MINI_CART_OPEN](state, miniCartOpen) {
       state.miniCartOpen = miniCartOpen;
     },
diff --git a/sunrise.config.js b/sunrise.config.js
index a5106d94..95f5513d 100644
--- a/sunrise.config.js
+++ b/sunrise.config.js
@@ -17,6 +17,43 @@ export default {
     en: 'English',
     de: 'Deutsch',
   },
+  countries: {
+    DE: 'Deutschland',
+    US: 'United States',
+  },
+  formats: {
+    number: {
+      DE: {
+        currency: {
+          style: 'currency',
+          currency: 'EUR',
+          currencyDisplay: 'symbol',
+        },
+      },
+      US: {
+        currency: {
+          style: 'currency',
+          currency: 'USD',
+        },
+      },
+    },
+    datetime: {
+      US: {
+        short: {
+          year: 'numeric',
+          month: 'short',
+          day: 'numeric',
+        },
+      },
+      DE: {
+        short: {
+          year: 'numeric',
+          month: 'short',
+          day: 'numeric',
+        },
+      },
+    },
+  },
   categories: {
     salesExternalId: '6',
   },
diff --git a/tests/e2e/specs/cartDetailPage_spec.js b/tests/e2e/specs/cartDetailPage_spec.js
index 959ff3f5..cca8d213 100644
--- a/tests/e2e/specs/cartDetailPage_spec.js
+++ b/tests/e2e/specs/cartDetailPage_spec.js
@@ -1,6 +1,5 @@
 describe('CartDetailPage', () => {
   beforeEach(() => {
-    localStorage.removeItem('auth');
     cy.visit('/cart');
   });
 
@@ -15,10 +14,13 @@ describe('CartDetailPage', () => {
       .contains(/^\s*5 items in total\s*$/);
 
     cy.get('[data-test=cart-total-price]')
-      .contains(/^\s*1.019,86\s€\s*$/);
+      .contains(/^\s*815,90\s€\s*$/);
+
+    cy.get('[data-test=cart-taxes-amount]')
+      .contains(/^\s*130,27\s€\s*$/);
 
     cy.get('[data-test=cart-subtotal-price]')
-      .contains(/^\s*1.019,86\s€\s*$/);
+      .contains(/^\s*815,90\s€\s*$/);
 
     cy.get('[data-test=cart-line-item]')
       .should('have.length', 2)
@@ -39,15 +41,15 @@ describe('CartDetailPage', () => {
 
         cy.wrap($lineItem)
           .find('[data-test=price-old-value]')
-          .contains(/^\s*248,75\s€\s*$/);
+          .contains(/^\s*199,00\s€\s*$/);
 
         cy.wrap($lineItem)
           .find('[data-test=price-new-value]')
-          .contains(/^\s*174,12\s€\s*$/);
+          .contains(/^\s*139,30\s€\s*$/);
 
         cy.wrap($lineItem)
           .find('[data-test=cart-line-item-total-price]')
-          .contains(/^\s*522,36\s€\s*$/);
+          .contains(/^\s*417,90\s€\s*$/);
       });
   });
 
@@ -65,7 +67,7 @@ describe('CartDetailPage', () => {
           .type('5');
         cy.wrap($lineItem)
           .find('[data-test=cart-line-item-total-price]')
-          .contains(/^\s*870,60\s€\s*$/);
+          .contains(/^\s*696,50\s€\s*$/);
 
         cy.wrap($lineItem)
           .find('[data-test=cart-line-item-quantity-inc]')
@@ -76,7 +78,7 @@ describe('CartDetailPage', () => {
           .should('have.value', '7');
         cy.wrap($lineItem)
           .find('[data-test=cart-line-item-total-price]')
-          .contains(/^\s*1.218,84\s€\s*$/);
+          .contains(/^\s*975,10\s€\s*$/);
 
         cy.wrap($lineItem)
           .find('[data-test=cart-line-item-quantity-dec]')
@@ -86,7 +88,7 @@ describe('CartDetailPage', () => {
           .should('have.value', '6');
         cy.wrap($lineItem)
           .find('[data-test=cart-line-item-total-price]')
-          .contains(/^\s*1.044,72\s€\s*$/);
+          .contains(/^\s*835,80\s€\s*$/);
 
         cy.wrap($lineItem)
           .find('[data-test=cart-line-item-delete]').click();
@@ -113,14 +115,14 @@ describe('CartDetailPage', () => {
     cy.visit('/cart');
 
     cy.get('[data-test=cart-line-item-total-price]')
-      .contains(/^\s*248,75\s€\s*$/);
+      .contains(/^\s*199,00\s€\s*$/);
 
     cy.get('[data-test=discount-code-input]')
       .type('SUNRISE_CI');
     cy.get('[data-test=apply-discount-code-button]')
       .click();
     cy.get('[data-test=cart-total-price]')
-      .contains(/^\s*124,37\s€\s*$/);
+      .contains(/^\s*99,50\s€\s*$/);
 
     cy.get('[data-test=discount-code-name]')
       .contains('SUNRISE_CI');
@@ -128,6 +130,6 @@ describe('CartDetailPage', () => {
       .click();
 
     cy.get('[data-test=cart-line-item-total-price]')
-      .contains(/^\s*124,37\s€\s*$/);
+      .contains(/^\s*199,00\s€\s*$/);
   });
 });
diff --git a/tests/e2e/specs/locationSelector_spec.js b/tests/e2e/specs/locationSelector_spec.js
index 6685ca40..f4ceb8b8 100644
--- a/tests/e2e/specs/locationSelector_spec.js
+++ b/tests/e2e/specs/locationSelector_spec.js
@@ -1,32 +1,41 @@
 describe('Location selector', () => {
-  context('with initial DE', () => {
-    beforeEach(() => {
-      localStorage.setItem('locale', 'de');
-      cy.visit('/product/lemare-booties-0778-grey/M0E20000000E0WX');
-    });
-
-    it('changes text to EN', () => {
-      cy.get('[data-test=product-name]').should('contain', 'Stiefeletten Lemare grau');
-      cy.get('[data-test=stores-link]').should('contain', 'Filiale');
-
-      cy.get('[data-test=location-selector-open-button]').click();
-      cy.get('span[data-test=location-selector-dropdown]')
-        .click()
-        .parent()
-        .contains('English')
-        .click()
-        .should(() => {
-          expect(localStorage.getItem('locale')).to.eq('en');
-        });
-
-      cy.get('[data-test=product-name]').should('contain', 'Booties Lemare grey');
-      cy.get('[data-test=stores-link]').should('contain', 'Stores');
-
-      cy.get('span[data-test=location-selector-dropdown]')
-        .parent()
-        .should('exist')
-        .trigger('mouseleave')
-        .should('not.exist');
-    });
+  beforeEach(() => {
+    cy.visit('/product/lemare-booties-0778-grey/M0E20000000E0WX');
+  });
+
+  it('changes text to selected language', () => {
+    cy.changeLanguage('Deutsch');
+
+    cy.get('[data-test=product-name]').should('contain', 'Stiefeletten Lemare grau');
+    cy.get('[data-test=stores-link]').should('contain', 'Filiale');
+
+    cy.changeLanguage('English');
+
+    cy.get('[data-test=product-name]').should('contain', 'Booties Lemare grey');
+    cy.get('[data-test=stores-link]').should('contain', 'Stores');
+  });
+
+  it('opens and closes location selector', () => {
+    cy.changeLanguage('Deutsch');
+    cy.get('span[data-test=location-selector-dropdown]')
+      .parent()
+      .should('not.exist');
+
+    cy.get('[data-test=location-selector-open-button]').click();
+    cy.get('span[data-test=location-selector-dropdown]')
+      .parent()
+      .should('exist')
+      .trigger('mouseleave')
+      .should('not.exist');
+
+    cy.get('[data-test=location-selector-open-button]').click();
+    cy.get('span[data-test=location-selector-dropdown]')
+      .parent()
+      .should('exist');
+
+    cy.get('[data-test=location-selector-open-button]').click();
+    cy.get('span[data-test=location-selector-dropdown]')
+      .parent()
+      .should('not.exist');
   });
 });
diff --git a/tests/e2e/specs/miniCart_spec.js b/tests/e2e/specs/miniCart_spec.js
index c42447fb..e2b0b7bc 100644
--- a/tests/e2e/specs/miniCart_spec.js
+++ b/tests/e2e/specs/miniCart_spec.js
@@ -18,7 +18,7 @@ describe('MiniCart', () => {
       .trigger('click');
 
     cy.get('[data-test=mini-cart-price]')
-      .contains(/^\s*Total\s+1.019,86\s€\s*$/);
+      .contains(/^\s*Total\s+815,90\s€\s*$/);
 
     cy.get('[data-test=mini-cart-line-item]')
       .should('have.length', 2)
@@ -35,7 +35,7 @@ describe('MiniCart', () => {
 
         cy.wrap($lineItem)
           .find('[data-test=cart-line-item-price]')
-          .contains(/^\s*522,36\s€\s*$/);
+          .contains(/^\s*417,90\s€\s*$/);
       });
 
     cy.get('[data-test=cart-line-item-delete]')
diff --git a/tests/e2e/specs/orderList_spec.js b/tests/e2e/specs/orderList_spec.js
index 1000d336..38e0b48b 100644
--- a/tests/e2e/specs/orderList_spec.js
+++ b/tests/e2e/specs/orderList_spec.js
@@ -39,8 +39,9 @@ describe('my orders', () => {
   };
 
   before(() => {
+    cy.visit('/');
+    cy.changeLanguage('Deutsch');
     cy.login(customer);
-    localStorage.setItem('locale', 'de');
   });
 
   it('shows my orders', () => {
diff --git a/tests/e2e/support/commands.js b/tests/e2e/support/commands.js
index 0339cedd..19f7c42c 100644
--- a/tests/e2e/support/commands.js
+++ b/tests/e2e/support/commands.js
@@ -47,6 +47,15 @@ Cypress.Commands.add('checkCustomerIsLoggedIn', (customer) => {
   cy.get('[data-test=login-info-name]').should('contain', customer.firstName);
 });
 
+Cypress.Commands.add('changeLanguage', (language) => {
+  cy.get('[data-test=location-selector-open-button]').click();
+  cy.get('span[data-test=location-selector-dropdown]')
+    .click()
+    .parent()
+    .contains(language)
+    .click();
+});
+
 Cypress.Commands.add('createCustomer', draft => cy.wrap(clientPromise
   .then(client => mutation.deleteCustomer(client, draft.email)
     .then(() => mutation.createCustomer(client, draft)))));
diff --git a/yarn.lock b/yarn.lock
index b24a646d..03f398c7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4472,7 +4472,7 @@ deepmerge@^1.5.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753"
   integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==
 
-deepmerge@^2.1.1, deepmerge@^2.2.1:
+deepmerge@^2.1.0, deepmerge@^2.1.1, deepmerge@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
   integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
@@ -11051,6 +11051,11 @@ shellwords@^0.1.1:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
+shvl@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/shvl/-/shvl-1.3.1.tgz#6c20a17b4a20b08e9f8cab60c50a92229fcc176e"
+  integrity sha512-+rRPP46hloYUAEImJcqprUgXu+05Ikqr4h4V+w5i2zJy37nAqtkQKufs3+3S2fDq6JNRrHMIQhB/Vaex+jgAAw==
+
 sigmund@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
@@ -12451,6 +12456,14 @@ vuelidate@^0.7.4:
   resolved "https://registry.yarnpkg.com/vuelidate/-/vuelidate-0.7.4.tgz#5a0e54be09ac0192f1aa3387d74b92e0945bf8aa"
   integrity sha512-QHZWYOL325Zo+2K7VBNEJTZ496Kd8Z31p85aQJFldKudUUGBmgw4zu4ghl4CyqPwjRCmqZ9lDdx4FSdMnu4fGg==
 
+vuex-persistedstate@^2.5.4:
+  version "2.5.4"
+  resolved "https://registry.yarnpkg.com/vuex-persistedstate/-/vuex-persistedstate-2.5.4.tgz#a19710ad7f9a08cea4e65fc585924d9fdac7384a"
+  integrity sha512-XYJhKIwO+ZVlTaXyxKxnplrJ88Fnvk5aDw753bxzRw5/yMKLQ6lq9CDCBex2fwZaQcLibhtgJOxGCHjy9GLSlQ==
+  dependencies:
+    deepmerge "^2.1.0"
+    shvl "^1.3.0"
+
 vuex@^3.0.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.1.1.tgz#0c264bfe30cdbccf96ab9db3177d211828a5910e"