diff --git a/src/components/ContractTab/FunctionInterface.vue b/src/components/ContractTab/FunctionInterface.vue
index f8d9036c9..3e0c72a62 100644
--- a/src/components/ContractTab/FunctionInterface.vue
+++ b/src/components/ContractTab/FunctionInterface.vue
@@ -2,7 +2,7 @@
 <!-- eslint-disable no-unused-vars -->
 <!-- eslint-disable max-len -->
 <script lang="ts">
-import { defineComponent, toRaw } from 'vue';
+import { defineComponent } from 'vue';
 import { mapGetters } from 'vuex';
 import { BigNumber, ethers } from 'ethers';
 import { Transaction } from '@ethereumjs/tx';
@@ -243,7 +243,12 @@ export default defineComponent({
                 );
         },
         async runNative(opts: Opts) {
-            const contractInstance = toRaw(await this.contract.getContractInstance());
+            const contractInstance = await useChainStore().currentChain.settings.getContractManager().getContractInstance(this.contract, null);
+            if (!contractInstance) {
+                this.errorMessage = this.$t('global.internal_error');
+                this.endLoading();
+                return;
+            }
             const func = contractInstance.populateTransaction[this.functionABI];
             const gasEstimater = contractInstance.estimateGas[this.functionABI];
             const gasLimit = await gasEstimater(...this.models.values, Object.assign({ from: this.address }, opts));
@@ -263,7 +268,7 @@ export default defineComponent({
             unsignedTrx.gasPrice = gasPrice;
 
             if (opts.value) {
-                unsignedTrx.value = opts.value;
+                unsignedTrx.value = BigNumber.from(opts.value);
             }
 
             const raw = ethers.utils.serializeTransaction(unsignedTrx);
diff --git a/src/components/header/AppHeaderWallet.vue b/src/components/header/AppHeaderWallet.vue
index e98dcc706..ac85c593d 100644
--- a/src/components/header/AppHeaderWallet.vue
+++ b/src/components/header/AppHeaderWallet.vue
@@ -12,6 +12,7 @@ import { useAccountStore, useChainStore } from 'src/core';
 import { WEI_PRECISION } from 'src/core/wallets/utils';
 import { prettyPrintCurrency } from 'src/core/wallets/utils/currency-utils';
 
+
 import LoginModal from 'components/LoginModal.vue';
 import OutlineButton from 'components/OutlineButton.vue';
 
@@ -82,6 +83,7 @@ function handleWalletButtonClick() {
 }
 
 function logout() {
+    $store.dispatch('login/logout');
     useAccountStore().logout();
 }
 
diff --git a/src/config/chains/telos-evm-testnet/index.ts b/src/config/chains/telos-evm-testnet/index.ts
index 0e2fddf76..6e71a3668 100644
--- a/src/config/chains/telos-evm-testnet/index.ts
+++ b/src/config/chains/telos-evm-testnet/index.ts
@@ -216,7 +216,7 @@ const config: NetworkConfig =
         'rpcEndpoints': [
             {
                 'protocol': 'https',
-                'host': 'rpc.testnet.telos.net',
+                'host': 'testnet.telos.net',
                 'port': 443,
             },
         ],
diff --git a/src/config/chains/telos-evm/index.ts b/src/config/chains/telos-evm/index.ts
index 5e073e67d..ba955bcc6 100644
--- a/src/config/chains/telos-evm/index.ts
+++ b/src/config/chains/telos-evm/index.ts
@@ -269,7 +269,7 @@ const config: NetworkConfig =
         'rpcEndpoints': [
             {
                 'protocol': 'https',
-                'host': 'rpc.telos.net',
+                'host': 'mainnet.telos.net',
                 'port': 443,
             },
         ],
diff --git a/src/store/login/actions.js b/src/store/login/actions.js
index 14f7bad35..805137f92 100644
--- a/src/store/login/actions.js
+++ b/src/store/login/actions.js
@@ -1,4 +1,5 @@
 import { useChainStore } from 'src/core';
+import { LOGIN_DATA_KEY } from 'src/lib/utils';
 
 export const login = async function(
     { commit, dispatch },
@@ -56,7 +57,7 @@ export const autoLogin = async function({ dispatch, commit }, returnUrl) {
 const getAuthenticator = function(ual, wallet = null) {
     const authWallet = wallet || localStorage.getItem('autoLogin');
     const idx = ual.authenticators.findIndex(
-        auth => auth.constructor.name === authWallet,
+        auth => auth.constructor.name.toLowerCase() === authWallet.toLowerCase(),
     );
     return {
         authenticator: ual.authenticators[idx],
@@ -64,16 +65,21 @@ const getAuthenticator = function(ual, wallet = null) {
     };
 };
 
-export const logout = async function({ getters }) {
+export const logout = async function({ getters, commit }) {
     if (getters.isNative) {
-        const { authenticator } = getAuthenticator(useChainStore().currentChain.settings.getUAL());
+        const loginData = JSON.parse(localStorage.getItem(LOGIN_DATA_KEY));
+        const { authenticator } = getAuthenticator(useChainStore().currentChain.settings.getUAL(), loginData.provider);
         try {
             authenticator && (await authenticator.logout());
         } catch (error) {
             console.error('Authenticator logout error', error);
         }
 
+        commit('setLogin', {});
+        localStorage.removeItem(LOGIN_DATA_KEY);
         localStorage.removeItem('autoLogin');
+        localStorage.removeItem('account');
+        localStorage.removeItem('returning');
 
         if (this.$router.currentRoute.path !== '/') {
             this.$router.push({ path: '/' });