diff --git a/server/api/models/User.js b/server/api/models/User.js
index ce3348b3..d843a88e 100755
--- a/server/api/models/User.js
+++ b/server/api/models/User.js
@@ -64,6 +64,8 @@ module.exports = {
     },
   },
 
+  tableName: 'user_account',
+
   customToJSON() {
     return {
       ..._.omit(this, 'password'),
diff --git a/server/db/migrations/20180721020022_create_next_id_function.js b/server/db/migrations/20180721020022_create_next_id_function.js
index 286f280c..809ac349 100644
--- a/server/db/migrations/20180721020022_create_next_id_function.js
+++ b/server/db/migrations/20180721020022_create_next_id_function.js
@@ -23,6 +23,5 @@ module.exports.up = knex =>
 module.exports.down = knex =>
   knex.raw(`
     DROP SEQUENCE next_id_seq;
-
     DROP FUNCTION next_id(OUT id BIGINT);
   `);
diff --git a/server/db/migrations/20180721220409_create_user_table.js b/server/db/migrations/20180721220409_create_user_account_table.js
similarity index 68%
rename from server/db/migrations/20180721220409_create_user_table.js
rename to server/db/migrations/20180721220409_create_user_account_table.js
index 55fefffc..f1f8f212 100755
--- a/server/db/migrations/20180721220409_create_user_table.js
+++ b/server/db/migrations/20180721220409_create_user_account_table.js
@@ -1,6 +1,6 @@
 module.exports.up = knex =>
   knex.schema
-    .createTable('user', table => {
+    .createTable('user_account', table => {
       /* Columns */
 
       table
@@ -19,7 +19,7 @@ module.exports.up = knex =>
       table.timestamp('deleted_at', true);
     })
     .raw(
-      'ALTER TABLE "user" ADD CONSTRAINT "user_email_unique" EXCLUDE ("email" WITH =) WHERE ("deleted_at" IS NULL)',
+      'ALTER TABLE "user_account" ADD CONSTRAINT "user_email_unique" EXCLUDE ("email" WITH =) WHERE ("deleted_at" IS NULL)',
     );
 
-module.exports.down = knex => knex.schema.dropTable('user');
+module.exports.down = knex => knex.schema.dropTable('user_account');
diff --git a/server/db/seeds/default.js b/server/db/seeds/default.js
index 0879e519..967a900e 100644
--- a/server/db/seeds/default.js
+++ b/server/db/seeds/default.js
@@ -1,9 +1,9 @@
-import bcrypt from 'bcrypt';
+const bcrypt = require('bcrypt');
 
 exports.seed = knex => {
   const date = new Date().toUTCString();
 
-  return knex('user').insert({
+  return knex('user_account').insert({
     email: 'demo@demo.demo',
     password: bcrypt.hashSync('demo', 10),
     isAdmin: true,