diff --git a/bff/db/migration/000001_init_schema.up.sql b/bff/db/migration/000001_init_schema.up.sql
index 5a083d0..4afbf86 100644
--- a/bff/db/migration/000001_init_schema.up.sql
+++ b/bff/db/migration/000001_init_schema.up.sql
@@ -1,5 +1,5 @@
 CREATE TABLE "mails" (
-  "id" bigserial UNIQUE PRIMARY KEY NOT NULL,
+  "id" BIGSERIAL UNIQUE PRIMARY KEY NOT NULL,
   "from" varchar NOT NULL,
   "to" varchar[] NOT NULL,
   "cc" varchar[],
@@ -13,18 +13,23 @@ CREATE TABLE "mails" (
 );
 
 CREATE TABLE "accounts" (
-  "id" bigserial UNIQUE PRIMARY KEY NOT NULL,
+  "id" BIGSERIAL UNIQUE PRIMARY KEY NOT NULL,
   "permission_level" int NOT NULL DEFAULT 0,
   "passwordhash" varchar NOT NULL,
+  "email" varchar UNIQUE NOT NULL,
+  "secret_key" varchar,
+  "email_verified" boolean DEFAULT false,
+  "email_verified_time" timestamptz
+);
+
+CREATE TABLE "accounts_data" (
+  "id" BIGSERIAL UNIQUE PRIMARY KEY NOT NULL,
+  "account_id" bigint NOT NULL,
   "firstname" varchar NOT NULL,
   "lastname" varchar NOT NULL,
   "birthday" timestamptz NOT NULL,
   "privacy_accepted" boolean DEFAULT false,
   "privacy_accepted_date" timestamptz,
-  "email" varchar UNIQUE NOT NULL,
-  "secret_key" varchar,
-  "email_verified" boolean DEFAULT false,
-  "email_verified_time" timestamptz,
   "phone" varchar,
   "city" varchar NOT NULL,
   "zip" varchar NOT NULL,
@@ -48,7 +53,7 @@ CREATE TABLE "sessions" (
 );
 
 CREATE TABLE "persons" (
-  "id" bigserial UNIQUE PRIMARY KEY NOT NULL,
+  "id" BIGSERIAL UNIQUE PRIMARY KEY NOT NULL,
   "account_id" bigint NOT NULL,
   "firstname" varchar NOT NULL,
   "lastname" varchar NOT NULL,
@@ -64,7 +69,7 @@ CREATE TABLE "persons" (
 );
 
 CREATE TABLE "documents" (
-  "id" bigserial UNIQUE PRIMARY KEY NOT NULL,
+  "id" BIGSERIAL UNIQUE PRIMARY KEY NOT NULL,
   "person_id" bigint,
   "name" varchar NOT NULL,
   "type" varchar NOT NULL,
@@ -81,7 +86,7 @@ CREATE TABLE "documents" (
 );
 
 CREATE TABLE "payments" (
-  "id" bigserial UNIQUE PRIMARY KEY NOT NULL,
+  "id" BIGSERIAL UNIQUE PRIMARY KEY NOT NULL,
   "account_id" bigint NOT NULL,
   "payment_category" varchar NOT NULL,
   "bankname" varchar,
@@ -98,7 +103,7 @@ CREATE TABLE "payments" (
 );
 
 CREATE TABLE "providers" (
-  "id" bigserial UNIQUE PRIMARY KEY NOT NULL,
+  "id" BIGSERIAL UNIQUE PRIMARY KEY NOT NULL,
   "name" varchar NOT NULL,
   "description" text NOT NULL,
   "category" varchar NOT NULL,
@@ -110,7 +115,7 @@ CREATE TABLE "providers" (
 );
 
 CREATE TABLE "returns" (
-  "id" bigserial UNIQUE PRIMARY KEY NOT NULL,
+  "id" BIGSERIAL UNIQUE PRIMARY KEY NOT NULL,
   "person_id" bigint NOT NULL,
   "provider_id" bigint NOT NULL,
   "name" varchar NOT NULL,
@@ -125,7 +130,7 @@ CREATE TABLE "returns" (
 );
 
 CREATE TABLE "returnsLog" (
-  "id" bigserial UNIQUE PRIMARY KEY NOT NULL,
+  "id" BIGSERIAL UNIQUE PRIMARY KEY NOT NULL,
   "return_id" bigint NOT NULL,
   "mail_id" bigint NOT NULL,
   "status" varchar NOT NULL DEFAULT 'created',
@@ -135,6 +140,9 @@ CREATE TABLE "returnsLog" (
   "changed" timestamptz NOT NULL DEFAULT (now())
 );
 
+
+ALTER TABLE "accounts_data" ADD FOREIGN KEY ("account_id") REFERENCES "accounts" ("id");
+
 ALTER TABLE "sessions" ADD FOREIGN KEY ("account_id") REFERENCES "accounts" ("id");
 
 ALTER TABLE "persons" ADD FOREIGN KEY ("account_id") REFERENCES "accounts" ("id");