diff --git a/app/lib/database/model/User.js b/app/lib/database/model/User.js
index 1b46e2367..9bc1f2008 100644
--- a/app/lib/database/model/User.js
+++ b/app/lib/database/model/User.js
@@ -14,9 +14,5 @@ export default class User extends Model {
 
 	@field('avatar_etag') avatarETag;
 
-	@field('login_email_password') loginEmailPassword;
-
-	@field('show_message_in_main_thread') showMessageInMainThread;
-
 	@json('roles', sanitizer) roles;
 }
diff --git a/app/lib/database/model/servers/User.js b/app/lib/database/model/servers/User.js
index 3eb9874d0..5b4d3d65a 100644
--- a/app/lib/database/model/servers/User.js
+++ b/app/lib/database/model/servers/User.js
@@ -21,4 +21,8 @@ export default class User extends Model {
 	@json('roles', sanitizer) roles;
 
 	@field('avatar_etag') avatarETag;
+
+	@field('login_email_password') loginEmailPassword;
+
+	@field('show_message_in_main_thread') showMessageInMainThread;
 }