diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7b51b34..db19f74 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,6 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/test/auth.test.js" beforeDir="false" afterPath="$PROJECT_DIR$/test/auth.test.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/server.js" beforeDir="false" afterPath="$PROJECT_DIR$/test/server.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -233,7 +232,9 @@
       <workItem from="1649107498906" duration="40359000" />
       <workItem from="1649344354475" duration="393000" />
       <workItem from="1649357562165" duration="339000" />
-      <workItem from="1650477477921" duration="11027000" />
+      <workItem from="1650477477921" duration="11159000" />
+      <workItem from="1650650704822" duration="2085000" />
+      <workItem from="1652833416088" duration="1319000" />
     </task>
     <task id="LOCAL-00001" summary="NEW:v3.0.0">
       <created>1614872764649</created>
@@ -403,7 +404,14 @@
       <option name="project" value="LOCAL" />
       <updated>1649357895413</updated>
     </task>
-    <option name="localTasksCounter" value="25" />
+    <task id="LOCAL-00025" summary="feat: new login method&#10;&#10;Previously if exist expired tokens on storage conflict with the new access and refresh token, so was added login method where force use new tokens and discard older">
+      <created>1650590876456</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1650590876456</updated>
+    </task>
+    <option name="localTasksCounter" value="26" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
diff --git a/src/index.js b/src/index.js
index 252a4b0..e2916fd 100644
--- a/src/index.js
+++ b/src/index.js
@@ -50,6 +50,7 @@ class WebAuth {
      * @returns {Promise<String|undefined>}
      */
     login(accessToken, refreshToken, remember = false) {
+        this.storage = remember ? 'localStorage' : 'sessionStorage';
         return this.set(accessToken, refreshToken, remember, true);
     }
 
@@ -62,7 +63,6 @@ class WebAuth {
      * @returns {Promise<String|undefined>}
      */
     async set(access = '', refresh = '', remember = false, forceNew = false) {
-        this.storage = remember ? 'localStorage' : 'sessionStorage';
         const { accessToken = access, refreshToken = refresh } = !forceNew ? this.getTokens() : { accessToken: access, refreshToken: refresh };
         this.debug('log', 'Initializing WebAuth with tokens', accessToken, refreshToken);
         if (!accessToken) return this.fire('empty', accessToken);
diff --git a/test/auth.test.js b/test/auth.test.js
index 65d630b..8448d5a 100644
--- a/test/auth.test.js
+++ b/test/auth.test.js
@@ -159,7 +159,7 @@ describe('Test WebAuth', function () {
         const auth = new WebAuth(randomKeys());
         const { accessToken: keyAccess, refreshToken: keyRefresh } = auth.keys;
         auth.on('verify', () => true);
-        await auth.set(accessToken, refreshToken, true);
+        await auth.login(accessToken, refreshToken, true);
         chai.expect(window.localStorage.getItem(keyAccess)).to.be.equal(accessToken);
         chai.expect(window.localStorage.getItem(keyRefresh)).to.be.equal(refreshToken);
     });
@@ -176,7 +176,7 @@ describe('Test WebAuth', function () {
                 chai.expect(checkStoreIsEmpty(key, key2)).to.be.equal(true);
                 resolve();
             });
-            await auth.set(accessToken, refreshToken);
+            await auth.login(accessToken, refreshToken);
             auth.logout();
         });
     });
@@ -188,7 +188,7 @@ describe('Test WebAuth', function () {
         auth.on('verify', () => true);
         return new Promise(resolve => {
             auth.on('ready', resolve);
-            auth.set(accessToken, refreshToken);
+            auth.login(accessToken, refreshToken);
         });
     });
 
@@ -200,7 +200,7 @@ describe('Test WebAuth', function () {
         return new Promise(async resolve => {
             await wait();
             auth.on('ready', resolve);
-            return auth.set(accessToken, refreshToken);
+            return auth.login(accessToken, refreshToken);
         });
     }).timeout(5000);
 
@@ -217,7 +217,7 @@ describe('Test WebAuth', function () {
                 auth.logout();
                 resolve();
             });
-            await auth.set(accessToken, refreshToken);
+            await auth.login(accessToken, refreshToken);
         });
     }).timeout(10000);
 
@@ -234,7 +234,7 @@ describe('Test WebAuth', function () {
                 auth.logout();
                 resolve();
             });
-            await auth.set(accessToken, refreshToken);
+            await auth.login(accessToken, refreshToken);
         });
     }).timeout(5000);
 
@@ -258,7 +258,7 @@ describe('Test WebAuth', function () {
                 auth.logout();
                 resolve();
             });
-            await auth.set(accessToken, refreshToken);
+            await auth.login(accessToken, refreshToken);
         });
     }).timeout(15000);
 
@@ -279,7 +279,7 @@ describe('Test WebAuth', function () {
                 auth.logout();
                 resolve();
             });
-            await auth.set(accessToken, refreshToken);
+            await auth.login(accessToken, refreshToken);
             await auth.renew();
         });
     });
@@ -302,7 +302,7 @@ describe('Test WebAuth', function () {
             await wait(3000);
             const login2 = await login();
             auth.on('ready', resolve);
-            await auth.set(login2.accessToken, login2.refreshToken);
+            await auth.login(login2.accessToken, login2.refreshToken);
         });
     }).timeout(5000);