diff --git a/packages/nc-gui-v2/composables/useGlobalState.ts b/packages/nc-gui-v2/composables/useGlobalState.ts index c40e232f30..137876ba85 100644 --- a/packages/nc-gui-v2/composables/useGlobalState.ts +++ b/packages/nc-gui-v2/composables/useGlobalState.ts @@ -132,7 +132,7 @@ export const useGlobalState = (): GlobalState => { watch( () => !!(payload && payload.exp && payload.exp - 5 * 60 < timestamp / 1000), async (expiring) => { - if (payload && expiring) { + if (signedIn.value && payload && expiring) { await refreshToken() } }, diff --git a/packages/nc-gui-v2/pages/signin.vue b/packages/nc-gui-v2/pages/signin.vue index 6ac81d6d0e..44fed5e856 100644 --- a/packages/nc-gui-v2/pages/signin.vue +++ b/packages/nc-gui-v2/pages/signin.vue @@ -103,7 +103,7 @@ const resetError = () => { :rules="formRules.email" :label="$t('labels.email')" :placeholder="$t('labels.email')" - :persistent-placeholder="$t('labels.email')" + :persistent-placeholder="true" type="text" @focus="resetError" /> @@ -115,7 +115,7 @@ const resetError = () => { :rules="formRules.password" :label="$t('labels.password')" :placeholder="$t('labels.password')" - :persistent-placeholder="$t('labels.password')" + :persistent-placeholder="true" type="password" @focus="resetError" />