diff --git a/src/antelope/wallets/ual/MetakeepUAL.ts b/src/antelope/wallets/ual/MetakeepUAL.ts
index b37c8bb9..fd0638e0 100644
--- a/src/antelope/wallets/ual/MetakeepUAL.ts
+++ b/src/antelope/wallets/ual/MetakeepUAL.ts
@@ -21,6 +21,7 @@ export interface MetakeepUALOptions {
     reasonCallback?: (transaction: any) => string;
 }
 let metakeep: MetaKeep | null = null;
+const metakeep_name = 'metakeep.ual';
 
 // This interface is used to store the data in the local cache
 export interface MetakeepData {
@@ -92,7 +93,7 @@ export class MetakeepAuthenticator extends Authenticator {
     }
 
     getName() {
-        return 'metakeep.ual';
+        return metakeep_name;
     }
 
     /**
@@ -125,7 +126,7 @@ export class MetakeepAuthenticator extends Authenticator {
             // An icon displayed to app users when selecting their authentication method
             icon: 'no-icon',
             // Name displayed to app users
-            text: 'metakeep',
+            text: metakeep_name,
             // Background color displayed to app users who select your authenticator
             background: '#030238',
             // Color of text used on top the `backgound` property above
diff --git a/src/antelope/wallets/ual/utils/metakeep-cache.ts b/src/antelope/wallets/ual/utils/metakeep-cache.ts
index 3b39b1c7..d3b7bf2d 100644
--- a/src/antelope/wallets/ual/utils/metakeep-cache.ts
+++ b/src/antelope/wallets/ual/utils/metakeep-cache.ts
@@ -73,6 +73,10 @@ class MetakeepCache {
         }
     }
 
+    public getMails(): string[] {
+        return Object.keys(this.cache);
+    }
+
     public getEosAddress(email: string): string {
         this.assertCache(email);
         return this.cache[email]?.wallet?.eosAddress ?? '';
diff --git a/src/i18n/en-us/index.js b/src/i18n/en-us/index.js
index 330bd044..fa486ba9 100644
--- a/src/i18n/en-us/index.js
+++ b/src/i18n/en-us/index.js
@@ -618,5 +618,17 @@ export default {
         telos_cloud_discontinued_title: 'Important',
         telos_cloud_discontinued_message_title: 'Attention Users: Telos Cloud Wallet account option will be discontinued.',
         telos_cloud_discontinued_message_body:'The Telos Cloud Wallet (ORE ID via Google) account option to connect and sign transactions will be discontinued after December 31st. If you use the Telos Cloud Wallet to access your account, please transfer your assets to another wallet before this deadline. <strong> This change does <i>not</i> impact users accessing their accounts via Metamask, WalletConnect, Anchor, or other sign-in methods.</strong>',
+        welcome_new_telos_cloud_title_part_1: 'New Telos Cloud Wallet',
+        welcome_new_telos_cloud_title_part_2: 'Welcome back',
+        welcome_new_telos_cloud: 'If you are new to Telos Cloud Wallet, please sign in with your Google account to create a new Telos account.',
+        warn_old_telos_cloud_users_title: 'Attention Old Users',
+        warn_old_telos_cloud_users_part_1: 'If you are an old Telos Cloud Wallet user, you need to log in with the Google above first, button to create your brand-new account. Then log out and come back here to start the migration.',
+        warn_old_telos_cloud_users_part_2: 'If you are an old Telos Cloud Wallet user, now you can start migrating all your assets to your new account. Please click the button below to start the migration.',
+
+        you_need_to_migrate_title: 'You need to migrate your assets',
+        you_need_to_migrate_sub_title: 'The access to this account will be discontinued, therefore you need to migrate your assets to a new account.',
+        you_need_to_migrate_nfts_first: 'You should start transfer all your collectibles to your new account first, and then continue with your tokens.',
+        you_need_to_migrate_all_tokens: 'You should start transfer all your tokens to your new account. Leave the TLOS tokens for the end.',
+
     },
 };
diff --git a/src/pages/evm/wallet/WalletPage.vue b/src/pages/evm/wallet/WalletPage.vue
index e2a7a297..91f61031 100644
--- a/src/pages/evm/wallet/WalletPage.vue
+++ b/src/pages/evm/wallet/WalletPage.vue
@@ -7,9 +7,11 @@ import WalletPageHeader from 'pages/evm/wallet/WalletPageHeader.vue';
 import WalletBalanceRow from 'pages/evm/wallet/WalletBalanceRow.vue';
 import { CURRENT_CONTEXT, useAccountStore, useBalancesStore, useFeedbackStore, useHistoryStore } from 'src/antelope';
 import WalletTransactionsTab from 'pages/evm/wallet/WalletTransactionsTab.vue';
+// import { metakeepCache } from 'src/antelope/wallets/ual/utils/metakeep-cache';
+import { useI18n } from 'vue-i18n';
 
 const route = useRoute();
-
+const { t: $t } = useI18n();
 const historyStore = useHistoryStore();
 const accountStore = useAccountStore();
 const feedback = useFeedbackStore();
@@ -51,6 +53,45 @@ watch(accountStore, (newAccountStoreState) => {
 }, { immediate: true });
 
 
+// -------- migration functions ------------
+/*
+const metakeepAlreadyCreated = computed(() => {
+    const emails = metakeepCache.getMails();
+    if (emails.length > 0) {
+        const ethPubKey = metakeepCache.getEthAddress(emails[0]);
+        if (ethPubKey) {
+            return ethPubKey;
+        }
+    }
+    return '';
+});
+
+const nftsStore = useNftsStore();
+const balanceStore = useBalancesStore();
+const nfts = computed(() => nftsStore.loggedInventory);
+const balances = computed(() => balanceStore.loggedBalances);
+const authenticator = useAccountStore().getAccount(CURRENT_CONTEXT).authenticator;
+console.log('authenticator', authenticator);
+const currentAuthName = authenticator?.getName() || '';
+if (currentAuthName === 'metakeep' && metakeepAlreadyCreated.value !== '') {
+    // we need to notify the user that he needs to migrate his assets
+    getAntelope().config.notifyRememberInfoHandler(
+        $t('temporal.you_need_to_migrate_title'),
+        [{
+            tag: 'p',
+            class: 'c-notify__message--subtitle',
+            text: $t('temporal.you_need_to_migrate_sub_title'),
+        }, {
+            tag: 'p',
+            class: '',
+            text: nfts.value.length > 0 ? $t('temporal.you_need_to_migrate_nfts_first') : $t('temporal.you_need_to_migrate_all_tokens'),
+        }],
+        '',
+        'telos-cloud-discontinued',
+    );
+}
+*/
+
 </script>
 
 <template>
diff --git a/src/pages/home/EVMLoginButtons.vue b/src/pages/home/EVMLoginButtons.vue
index 72d10e91..320c7855 100644
--- a/src/pages/home/EVMLoginButtons.vue
+++ b/src/pages/home/EVMLoginButtons.vue
@@ -7,6 +7,7 @@ import { Menu } from 'src/pages/home/MenuType';
 import InlineSvg from 'vue-inline-svg';
 import { isTodayBeforeTelosCloudDown } from 'src/App.vue';
 import { googleCtrl } from 'src/pages/home/GoogleOneTap';
+import { metakeepCache } from 'src/antelope/wallets/ual/utils/metakeep-cache';
 
 export default defineComponent({
     name: 'EVMLoginButtons',
@@ -155,6 +156,17 @@ export default defineComponent({
             },
         });
 
+        const newAccountAlreadyCreated = computed(() => {
+            const emails = metakeepCache.getMails();
+            if (emails.length > 0) {
+                const ethPubKey = metakeepCache.getEthAddress(emails[0]);
+                if (ethPubKey) {
+                    return true;
+                }
+            }
+            return false;
+        });
+
         return {
             isLoading,
             isLoadingOreId,
@@ -182,6 +194,7 @@ export default defineComponent({
             googleSubscription,
             showGoogleLoading,
             googleCtrl,
+            newAccountAlreadyCreated,
         };
     },
     unmounted() {
@@ -316,6 +329,13 @@ export default defineComponent({
     <!-- telos cloud menu -->
     <template v-if="showTelosCloudMenu">
 
+        <div class="c-evm-login-buttons__title">{{
+            newAccountAlreadyCreated ?
+                $t('temporal.welcome_new_telos_cloud_title_part_2') :
+                $t('temporal.welcome_new_telos_cloud_title_part_1')
+        }}</div>
+        <div class="c-evm-login-buttons__sub-title">{{ $t('temporal.welcome_new_telos_cloud') }}</div>
+
         <div v-if="showGoogleLoading" >
             <div class="c-evm-login-buttons__loading"><QSpinnerFacebook /></div>
         </div>
@@ -327,35 +347,33 @@ export default defineComponent({
             <div class="c-evm-login-buttons__loading"><QSpinnerFacebook /></div>
         </div>
 
-        <div class="c-evm-login-buttons__sub-title">{{ $t('home.coming_soon') }}</div>
+        <div class="c-evm-login-buttons__title q-mt-md">{{ $t('temporal.warn_old_telos_cloud_users_title') }}</div>
 
-        <!-- Facebook OAuth Provider -->
-        <div class="c-evm-login-buttons__option c-evm-login-buttons__option--web2 c-evm-login-buttons__option--disabled">
-            <template v-if="isLoadingOreId('facebook')">
-                <div class="c-evm-login-buttons__loading"><QSpinnerFacebook /></div>
-            </template>
-            <template v-else>
-                <img
-                    width="24"
-                    class="c-evm-login-buttons__icon c-evm-login-buttons__icon--disabled"
-                    src="~assets/icon--facebook.svg"
-                >
-                {{ $t('home.sign_with_facebook') }}
-            </template>
-        </div>
+        <div class="c-evm-login-buttons__sub-title">{{
+            newAccountAlreadyCreated ?
+                $t('temporal.warn_old_telos_cloud_users_part_2') :
+                $t('temporal.warn_old_telos_cloud_users_part_1')
+        }}</div>
 
-        <!-- X OAuth Provider -->
-        <div class="c-evm-login-buttons__option c-evm-login-buttons__option--web2 c-evm-login-buttons__option--disabled">
-            <template v-if="isLoadingOreId('facebook')">
+        <!-- Google old OreId Authenticator -->
+        <div
+            :class="{
+                'c-evm-login-buttons__option': true,
+                'c-evm-login-buttons__option--web2': true,
+                'c-evm-login-buttons__option--disabled': !newAccountAlreadyCreated,
+            }"
+            @click="setOreIdAuthenticator('google')"
+        >
+            <template v-if="isLoadingOreId('google')">
                 <div class="c-evm-login-buttons__loading"><QSpinnerFacebook /></div>
             </template>
             <template v-else>
                 <img
                     width="24"
-                    class="c-evm-login-buttons__icon c-evm-login-buttons__icon--disabled"
-                    src="~assets/icon--twitter.svg"
+                    class="c-evm-login-buttons__icon"
+                    src="~assets/icon--google.svg"
                 >
-                {{ $t('home.sign_with_x') }}
+                {{ $t('home.sign_with_google') }}
             </template>
         </div>
 
@@ -421,6 +439,12 @@ export default defineComponent({
         gap: 8px;
     }
 
+    &__title {
+        @include text--header-4;
+        color: $white;
+        text-align: center;
+    }
+
     &__sub-title {
         color: $white;
     }
diff --git a/src/pages/home/NativeLoginButton.vue b/src/pages/home/NativeLoginButton.vue
index 5e125c78..ea23af32 100644
--- a/src/pages/home/NativeLoginButton.vue
+++ b/src/pages/home/NativeLoginButton.vue
@@ -17,7 +17,6 @@ export default defineComponent({
     },
     data() {
         return {
-            showLogin: false,
             showAuth: false,
             authType: 'signin',
             error: null,
@@ -67,6 +66,16 @@ export default defineComponent({
         showTelosCloudMenu() {
             return this.modelValue === Menu.CLOUD;
         },
+        newAccountAlreadyCreated() {
+            const emails = metakeepCache.getMails();
+            if (emails.length > 0) {
+                const ethPubKey = metakeepCache.getEthAddress(emails[0]);
+                if (ethPubKey) {
+                    return true;
+                }
+            }
+            return false;
+        },
     },
     mounted() {
         this.showGoogleLoading = false;
@@ -117,6 +126,10 @@ export default defineComponent({
             auth.setEmail(email);
             this.onLogin(idx);
         },
+        async loginAsOreId() {
+            const idx = this.$ual.authenticators.map(a => a.getName()).indexOf('ual-oreid');
+            this.onLogin(idx);
+        },
         async loginAsJustViewer() {
             let idx = this.$ual.authenticators.map(a => a.getName()).indexOf('cleos');
             this.onLogin(idx, true);
@@ -127,7 +140,6 @@ export default defineComponent({
         async onLogin(idx, justViewer = false) {
             const error = await this.login({ idx, justViewer });
             if (!error) {
-                this.showLogin = false;
                 await this.$router.push({ path: '/zero/balance' });
             } else {
                 this.error = error;
@@ -263,6 +275,12 @@ export default defineComponent({
 
             return wallet.getStyle().text;
         },
+        isLoading(wallet) {
+            return this.loading === wallet;
+        },
+        isLoadingOreId() {
+            return this.loading === 'ual-oreid';
+        },
     },
     watch: {
         async isAuthenticated() {
@@ -287,7 +305,7 @@ export default defineComponent({
     <template v-if="showMainMenu">
 
         <!-- Login Button -->
-        <div v-if="!isAuthenticated" class="q-px-md flex justify-center">
+        <template v-if="!isAuthenticated">
 
             <!-- Google OAuth Provider -->
             <div class="c-zero-login-buttons__option c-zero-login-buttons__option--telos-cloud" @click="setCloudMenu()">
@@ -320,36 +338,33 @@ export default defineComponent({
                 </div>
             </div>
 
-            <div class="q-mt-md q-mb-sm">
-                <q-btn
-                    :label="$t('home.connect_with_wallet')"
-                    class="purpleGradient q-px-md q-py-sm"
-                    @click="showLogin = true"
-                />
-            </div>
+            <!-- Authenticator buttons -->
+            <template
+                v-for="(wallet, idx) in $ual.authenticators"
+                :key="idx"
+            >
+                <div
+                    v-if="wallet.getName() !== 'metakeep.ual' && wallet.getName() !== 'ual-oreid'"
+                    class="c-zero-login-buttons__option"
+                    @click="onLogin(idx)"
+                >
+                    <template v-if="isLoading(wallet.getStyle().text)">
+                        <div class="c-zero-login-buttons__loading"><QSpinnerFacebook /></div>
+                    </template>
+                    <template v-else>
+                        <img
+                            :src="getWalletIcon(wallet)"
+                            width="24"
+                            class="c-zero-login-buttons__icon"
+                        >
+                        {{ getWalletName(wallet) }} {{  wallet.getName()  }}
+                    </template>
+                </div>
+            </template>
 
-            <!-- View any account -->
-            <div class="q-mt-md">
-                <q-btn
-                    text-color="white"
-                    outline
-                    :label="$t('home.view_any_account')"
-                    class="q-px-md q-py-sm"
-                    @click="loginAsJustViewer()"
-                />
-            </div>
+        </template>
 
-            <!-- Signup Button -->
-            <div class="q-mt-md">
-                <q-btn
-                    text-color="white"
-                    outline
-                    :label="$t('home.create_new_account')"
-                    class="q-px-md q-py-sm"
-                    @click="signUp"
-                />
-            </div>
-        </div>
+        <!-- if authenticated -->
         <div v-else class="q-px-md flex justify-center column">
             <p class="q-mb-lg logged-in"> {{ $t( 'home.logged_as', {account: accountName}) }}</p>
 
@@ -371,21 +386,40 @@ export default defineComponent({
         </div>
     </template>
 
+
     <!-- telos cloud menu -->
     <template v-if="showTelosCloudMenu">
         <div v-if="showGoogleLoading">
-            <div class="c-evm-login-buttons__loading"><QSpinnerFacebook /></div>
+            <div class="c-zero-login-buttons__loading"><QSpinnerFacebook /></div>
         </div>
         <div
             v-else
             id="google_btn"
             :data-client_id="googleCtrl.clientId"
         >
-            <div class="c-evm-login-buttons__loading"><QSpinnerFacebook /></div>
+            <div class="c-zero-login-buttons__loading"><QSpinnerFacebook /></div>
+        </div>
+
+        <div class="c-evm-login-buttons__sub-title">{{ $t('home.coming_soon') }}</div>
+
+        <!-- Google OAuth Provider -->
+        <!-- Google old OreId Authenticator -->
+        <div class="c-zero-login-buttons__option c-zero-login-buttons__option--web2" @click="loginAsOreId()">
+            <template v-if="isLoading('metakeep.ual')">
+                <div class="c-zero-login-buttons__loading"><QSpinnerFacebook /></div>
+            </template>
+            <template v-else>
+                <img
+                    width="24"
+                    class="c-zero-login-buttons__icon"
+                    src="~assets/icon--google.svg"
+                >
+                {{ $t('home.sign_with_google') }}
+            </template>
         </div>
-        <div class="c-zero-login-buttons__sub-title">{{ $t('home.coming_soon') }}</div>
 
-        <!-- Facebook OAuth Provider -->
+        <!--
+        < !-- Facebook OAuth Provider -- >
         <div class="c-zero-login-buttons__option c-zero-login-buttons__option--web2 c-zero-login-buttons__option--disabled">
             <img
                 width="24"
@@ -395,7 +429,7 @@ export default defineComponent({
             {{ $t('home.sign_with_facebook') }}
         </div>
 
-        <!-- X OAuth Provider -->
+        < !-- X OAuth Provider -- >
         <div class="c-zero-login-buttons__option c-zero-login-buttons__option--web2 c-zero-login-buttons__option--disabled">
             <img
                 width="24"
@@ -404,73 +438,9 @@ export default defineComponent({
             >
             {{ $t('home.sign_with_x') }}
         </div>
+        -->
     </template>
 
-    <!-- Show Login -->
-    <q-dialog v-model="showLogin">
-        <div class="column showLoginPopup q-pa-lg popupCard">
-            <div class="text-subtitle1">{{$t('login.connect_wallet')}}</div>
-            <q-list class="" dark separator>
-                <q-item
-                    v-for="(wallet, idx) in $ual.authenticators"
-                    :key="wallet.getStyle().text"
-                    v-ripple
-                    class="q-my-sm"
-                >
-                    <q-item-section class="cursor-pointer" avatar @click="onLogin(idx)">
-                        <img :src="getWalletIcon(wallet)" width="30" >
-                    </q-item-section>
-                    <q-item-section class="cursor-pointer" @click="onLogin(idx)">
-                        {{ getWalletName(wallet) }}
-                    </q-item-section>
-                    <q-item-section class="flex" avatar>
-                        <q-spinner
-                            v-if="loading === wallet.getStyle().text"
-                            :color="wallet.getStyle().textColor"
-                            size="2em"
-                        />
-                        <q-btn
-                            v-else
-                            :color="wallet.getStyle().textColor"
-                            icon="get_app"
-                            target="_blank"
-                            dense
-                            flat
-                            size="12px"
-                            @click="openUrl(wallet.getOnboardingLink())"
-                        >
-                            <q-tooltip>
-                                {{$t('login.get_app')}}
-                            </q-tooltip>
-                        </q-btn>
-                    </q-item-section>
-                </q-item>
-            </q-list>
-
-            <!-- Close Button -->
-            <q-btn
-                v-close-popup
-                size="md"
-                no-caps
-                rounded
-                flat
-                class="self-center flex-center"
-                label="Close"
-                :style="`display:flex;`"
-                @click="close"
-            />
-            <q-item
-                v-if="error"
-                :active="!!error"
-                active-class="bg-red-1 text-grey-8"
-            >
-                <q-item-section>
-                    {{ error }}
-                </q-item-section>
-            </q-item>
-        </div>
-    </q-dialog>
-
     <!-- RAM low dialog -->
     <q-dialog v-model="resLow" persistent>
         <q-card class="popupCard">
@@ -519,11 +489,6 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 
-.showLoginPopup {
-    width: 30rem;
-    height: auto;
-    margin-bottom: 5rem;
-}
 
 .logged-in{
     color: white;