diff --git a/src/components/pages/Settings.vue b/src/components/pages/Settings.vue
index 172d43c..669ed2f 100644
--- a/src/components/pages/Settings.vue
+++ b/src/components/pages/Settings.vue
@@ -723,9 +723,10 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex'
+import { mapActions, mapGetters, mapMutations } from 'vuex'
 import { debounce } from 'lodash-es'
 
+import TemplateVariablesList from '@components/settings/TemplateVariablesList.vue'
 import { getSettingsData } from '@/data/settings'
 import { trackTemplateVariables } from '@/data/file-templates'
 
@@ -735,7 +736,6 @@ import { flags } from '@/utils/flags'
 import { copyToClipboard } from '@/utils/utils'
 
 import BaseAccordion from '@/components/globals/BaseAccordion.vue'
-import TemplateVariablesList from '@components/settings/TemplateVariablesList.vue'
 import { fetchData, postToServer } from '@/utils/api'
 import { getFormItem } from '@/utils/forms'
 import { useLogs } from '@/use/logs'
@@ -860,6 +860,9 @@ export default {
 			dispatchLogout: 'logout',
 			dispatchLogin: 'login'
 		}),
+		...mapMutations({
+			setSpotifyUserId: 'SET_SPOTIFY_USER_ID'
+		}),
 		onTemplateVariableClick(templateName) {
 			copyToClipboard(templateName)
 			toast(`Copied ${templateName} to clipboard!`)
@@ -895,10 +898,11 @@ export default {
 
 			let changed = false
 
-			if (this.lastUser != this.spotifyUser) {
+			if (this.lastUser !== this.spotifyUser) {
 				// force cloning without linking
 				this.lastUser = (' ' + this.spotifyUser).slice(1)
 				localStorage.setItem('spotifyUser', this.lastUser)
+				this.setSpotifyUserId(this.lastUser)
 				changed = true
 			}
 
diff --git a/src/store/modules/login.js b/src/store/modules/login.js
index fd6d25b..9b32b68 100644
--- a/src/store/modules/login.js
+++ b/src/store/modules/login.js
@@ -107,6 +107,13 @@ const mutations = {
 		const clientMode = state.clientMode
 		Object.assign(state, getDefaultState())
 		state.clientMode = clientMode
+	},
+	SET_SPOTIFY_USER_ID(state, newSpotifyUserId) {
+		console.log('setting spotify user', { newSpotifyUserId })
+		state.spotifyUser = {
+			...state.spotifyUser,
+			id: newSpotifyUserId
+		}
 	}
 }