diff --git a/src/client/app/common/views/components/signin.vue b/src/client/app/common/views/components/signin.vue
index c1a7522b0..dd3d97985 100644
--- a/src/client/app/common/views/components/signin.vue
+++ b/src/client/app/common/views/components/signin.vue
@@ -67,7 +67,8 @@ export default Vue.extend({
 				username: this.username,
 				password: this.password,
 				token: this.user && this.user.twoFactorEnabled ? this.token : undefined
-			}, true).then(() => {
+			}, true).then(res => {
+				localStorage.setItem('i', res.i);
 				location.reload();
 			}).catch(() => {
 				alert(this.$t('login-failed'));
diff --git a/src/client/app/mios.ts b/src/client/app/mios.ts
index 5ed4dfd4d..fad60f413 100644
--- a/src/client/app/mios.ts
+++ b/src/client/app/mios.ts
@@ -190,8 +190,8 @@ export default class MiOS extends EventEmitter {
 				this.store.dispatch('mergeMe', freshData);
 			});
 		} else {
-			// Get token from cookie
-			const i = (document.cookie.match(/i=(!\w+)/) || [null, null])[1];
+			// Get token from cookie or localStorage
+			const i = (document.cookie.match(/i=(!\w+)/) || [null, null])[1] || localStorage.getItem('i');
 
 			fetchme(i, me => {
 				if (me) {
diff --git a/src/client/app/safe.js b/src/client/app/safe.js
index 026fc66c6..3e2e5ae57 100644
--- a/src/client/app/safe.js
+++ b/src/client/app/safe.js
@@ -11,11 +11,3 @@ if (!('fetch' in window)) {
 		'Your browser (or your OS) seems outdated. ' +
 		'To run Misskey, please update your browser to latest version or try other browsers.');
 }
-
-// Check whether cookie enabled
-if (!navigator.cookieEnabled) {
-	alert(
-		'Misskeyを利用するにはCookieを有効にしてください。' +
-		'\n\n' +
-		'To use Misskey, please enable Cookie.');
-}
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index 0a16a71a2..a498b0138 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -129,6 +129,7 @@ export default (os: MiOS) => new Vuex.Store({
 		logout(ctx) {
 			ctx.commit('updateI', null);
 			document.cookie = `i=; domain=${hostname}; expires=Thu, 01 Jan 1970 00:00:01 GMT;`;
+			localStorage.removeItem('i');
 		},
 
 		mergeMe(ctx, me) {
diff --git a/src/server/api/common/signin.ts b/src/server/api/common/signin.ts
index ddfd5f2bb..45a42e288 100644
--- a/src/server/api/common/signin.ts
+++ b/src/server/api/common/signin.ts
@@ -21,6 +21,7 @@ export default function(ctx: Koa.Context, user: ILocalUser, redirect = false) {
 
 		ctx.redirect(config.url);
 	} else {
-		ctx.status = 204;
+		ctx.body = { i: user.token };
+		ctx.status = 200;
 	}
 }