diff --git a/db/schema.sql b/db/schema.sql
index 3bb33c41..5ce34cdf 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -1,4 +1,4 @@
 DROP TABLE IF EXISTS mails;
 DROP TABLE IF EXISTS address;
-CREATE TABLE IF NOT EXISTS mails (id INTEGER PRIMARY KEY, address TEXT, message TEXT);
+CREATE TABLE IF NOT EXISTS mails (id INTEGER PRIMARY KEY, source TEXT, address TEXT, message TEXT);
 CREATE TABLE IF NOT EXISTS address (id INTEGER PRIMARY KEY, name TEXT UNIQUE);
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 8c90a5bf..eb898cb9 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,10 +1,11 @@
 <script setup>
 import { NGrid, NGi, NSpace, NAlert, NMessageProvider } from 'naive-ui'
 import { NSpin, NButton, NCard, NLayout, NPopconfirm } from 'naive-ui'
-import { onMounted, ref } from "vue";
+import { watch, onMounted, ref } from "vue";
 import { useStorage } from '@vueuse/core'
 
-const address = useStorage('address')
+const jwt = useStorage('jwt')
+const address = ref("")
 const result = ref("")
 const loading = ref(false)
 const data = ref([])
@@ -19,6 +20,7 @@ const refresh = async () => {
     const response = await fetch(`${API_BASE}/api/mails?address=${address.value}`, {
       method: "GET",
       headers: {
+        "Authorization": `Bearer ${jwt.value}`,
         "Content-Type": "application/json"
       },
     });
@@ -51,9 +53,9 @@ const newEmail = async () => {
       throw new Error(`${response.status} ${await response.text()}` || "error");
     }
     let res = await response.json();
-    address.value = res["address"];
+    jwt.value = res["jwt"];
   } catch (error) {
-    address.value = "";
+    jwt.value = "";
     console.error(error);
     result.value = error.message || "error";
   } finally {
@@ -62,7 +64,28 @@ const newEmail = async () => {
   await refresh();
 };
 
+const getSettings = async (jwt) => {
+  const response = await fetch(`${API_BASE}/api/settings`, {
+    method: "GET",
+    headers: {
+      "Authorization": `Bearer ${jwt}`,
+      "Content-Type": "application/json"
+    },
+  });
+
+  if (!response.ok) {
+    console.error(response);
+    address.value = "";
+  }
+  let res = await response.json();
+  address.value = res["address"];
+  await refresh();
+}
+
+watch(jwt, async (jwt, old) => getSettings(jwt))
+
 onMounted(async () => {
+  getSettings(jwt.value)
   await refresh();
   const token = import.meta.env.VITE_CF_WEB_ANALY_TOKEN;
 
@@ -115,7 +138,8 @@ onMounted(async () => {
                         <pre>{{ result }}</pre>
                       </span>
                     </n-alert>
-                    <n-alert v-for="row in data" v-bind:key="row.id" :title="`EMAIL ID: ${row.id}`" type="default">
+                    <n-alert v-for="row in data" v-bind:key="row.id" :title="`FROM: ${row.source} ID: ${row.id}`"
+                      type="default">
                       <div v-html="row.message"></div>
                     </n-alert>
                   </n-card>
diff --git a/worker/src/email.js b/worker/src/email.js
index ee90bfac..c2851760 100644
--- a/worker/src/email.js
+++ b/worker/src/email.js
@@ -17,8 +17,8 @@ async function email(message, env, ctx) {
         const parsedEmail = await parser.parse(rawEmail);
 
         const { success } = await env.DB.prepare(
-            `INSERT INTO mails (address, message) VALUES (?, ?)`
-        ).bind(message.to, parsedEmail.html).run();
+            `INSERT INTO mails (source, address, message) VALUES (?, ?, ?)`
+        ).bind(message.from, message.to, parsedEmail.html).run();
         if (!success) {
             message.setReject(`Failed save message to ${message.to}`);
         }
diff --git a/worker/src/router.js b/worker/src/router.js
index bf2a01c0..d4d289cf 100644
--- a/worker/src/router.js
+++ b/worker/src/router.js
@@ -1,4 +1,5 @@
 import { Hono } from 'hono'
+import { Jwt } from 'hono/utils/jwt'
 
 const api = new Hono()
 
@@ -8,11 +9,15 @@ api.get('/api/mails', async (c) => {
         return c.json({ "error": "No address" }, 400)
     }
     const { results } = await c.env.DB.prepare(
-        `SELECT id, message FROM mails where address = ? order by id desc limit 10`
+        `SELECT id, source, message FROM mails where address = ? order by id desc limit 10`
     ).bind(address).all();
     return c.json(results);
 })
 
+api.get('/api/settings', async (c) => {
+    return c.json(c.get("jwtPayload"));
+})
+
 api.get('/api/new_address', async (c) => {
     // insert new address
     const name = Math.random().toString(36).substring(2, 15)
@@ -22,8 +27,12 @@ api.get('/api/new_address', async (c) => {
     if (!success) {
         return c.json({ "error": "Failed to create address" }, 500)
     }
-    return c.json({
+    // create jwt
+    const jwt = await Jwt.sign({
         address: c.env.PREFIX + name + "@" + c.env.DOMAIN
+    }, c.env.JWT_SECRET)
+    return c.json({
+        jwt: jwt
     })
 })
 
diff --git a/worker/src/worker.js b/worker/src/worker.js
index 089c426a..54ce1758 100644
--- a/worker/src/worker.js
+++ b/worker/src/worker.js
@@ -1,11 +1,21 @@
 import { Hono } from 'hono'
 import { cors } from 'hono/cors';
+import { jwt } from 'hono/jwt'
 
 import { api } from './router';
 import { email } from './email';
 
 const app = new Hono()
 app.use('/*', cors());
+app.use('/api/*', async (c, next) => {
+	if (c.req.path.startsWith("/api/new_address")) {
+		await next();
+		return;
+	};
+	return jwt({ secret: c.env.JWT_SECRET })(c, next);
+});
+
+
 app.route('/', api)
 
 app.all('/*', async c => c.html(`<h1>Hello World</h1>`))
diff --git a/worker/wrangler.toml.template b/worker/wrangler.toml.template
index 2f55b205..47e06e5f 100644
--- a/worker/wrangler.toml.template
+++ b/worker/wrangler.toml.template
@@ -5,6 +5,7 @@ compatibility_date = "2023-08-14"
 [vars]
 PREFIX = "tmp"
 DOMAIN = "xxx.xxx"
+JWT_SECRET = "xxx"
 
 [[d1_databases]]
 binding = "DB"