diff --git a/database/entity/0003-login_server_tables/LoginUser.ts b/database/entity/0003-login_server_tables/LoginUser.ts
index cacc27be1..a3a83f450 100644
--- a/database/entity/0003-login_server_tables/LoginUser.ts
+++ b/database/entity/0003-login_server_tables/LoginUser.ts
@@ -1,5 +1,5 @@
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToOne } from 'typeorm'
-import { LoginUserBackup } from '../LoginUserBackup'
+import { LoginUserBackup } from './LoginUserBackup'
 
 // Moriz: I do not like the idea of having two user tables
 @Entity('login_users')
diff --git a/database/entity/0003-login_server_tables/LoginUserBackup.ts b/database/entity/0003-login_server_tables/LoginUserBackup.ts
index 7152e12e5..39f5e0db5 100644
--- a/database/entity/0003-login_server_tables/LoginUserBackup.ts
+++ b/database/entity/0003-login_server_tables/LoginUserBackup.ts
@@ -1,5 +1,5 @@
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, JoinColumn, OneToOne } from 'typeorm'
-import { LoginUser } from '../LoginUser'
+import { LoginUser } from './LoginUser'
 
 @Entity('login_user_backups')
 export class LoginUserBackup extends BaseEntity {
diff --git a/database/entity/0006-login_users_collation/LoginUser.ts b/database/entity/0006-login_users_collation/LoginUser.ts
index f29a46ffe..fdb17f4ad 100644
--- a/database/entity/0006-login_users_collation/LoginUser.ts
+++ b/database/entity/0006-login_users_collation/LoginUser.ts
@@ -1,5 +1,5 @@
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToOne } from 'typeorm'
-import { LoginUserBackup } from '../LoginUserBackup'
+import { LoginUserBackup } from '../0003-login_server_tables/LoginUserBackup'
 
 // Moriz: I do not like the idea of having two user tables
 @Entity('login_users', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' })
diff --git a/database/entity/0017-combine_user_tables/LoginUserBackup.ts b/database/entity/0017-combine_user_tables/LoginUserBackup.ts
new file mode 100644
index 000000000..456f9d8f7
--- /dev/null
+++ b/database/entity/0017-combine_user_tables/LoginUserBackup.ts
@@ -0,0 +1,16 @@
+import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, JoinColumn, OneToOne } from 'typeorm'
+
+@Entity('login_user_backups')
+export class LoginUserBackup extends BaseEntity {
+  @PrimaryGeneratedColumn('increment', { unsigned: true })
+  id: number
+
+  @Column({ type: 'text', name: 'passphrase', nullable: false })
+  passphrase: string
+
+  @Column({ name: 'user_id', nullable: false })
+  userId: number
+
+  @Column({ name: 'mnemonic_type', default: -1 })
+  mnemonicType: number
+}
diff --git a/database/entity/LoginUserBackup.ts b/database/entity/LoginUserBackup.ts
index 23d2c9271..7a3031a33 100644
--- a/database/entity/LoginUserBackup.ts
+++ b/database/entity/LoginUserBackup.ts
@@ -1 +1 @@
-export { LoginUserBackup } from './0003-login_server_tables/LoginUserBackup'
+export { LoginUserBackup } from './0017-combine_user_tables/LoginUserBackup'
diff --git a/database/entity/index.ts b/database/entity/index.ts
index cd1dd4e21..d64c66d51 100644
--- a/database/entity/index.ts
+++ b/database/entity/index.ts
@@ -1,7 +1,6 @@
 import { Balance } from './Balance'
 import { LoginElopageBuys } from './LoginElopageBuys'
 import { LoginEmailOptIn } from './LoginEmailOptIn'
-import { LoginUser } from './LoginUser'
 import { LoginUserBackup } from './LoginUserBackup'
 import { Migration } from './Migration'
 import { ServerUser } from './ServerUser'
@@ -18,7 +17,6 @@ export const entities = [
   Balance,
   LoginElopageBuys,
   LoginEmailOptIn,
-  LoginUser,
   LoginUserBackup,
   Migration,
   ServerUser,