diff --git a/app/Factory/CompanyFactory.php b/app/Factory/CompanyFactory.php
index 9b9843ea7949..6eb846084dc7 100644
--- a/app/Factory/CompanyFactory.php
+++ b/app/Factory/CompanyFactory.php
@@ -35,6 +35,7 @@ class CompanyFactory
         $company->custom_fields = (object) [];
         $company->subdomain = '';
         $company->enabled_modules = config('ninja.enabled_modules'); //32767;//8191; //4095
+        $company->default_password_timeout = 30;
 
         return $company;
     }
diff --git a/app/Factory/UserFactory.php b/app/Factory/UserFactory.php
index 8a4ca5a03ede..d731df89fbc9 100644
--- a/app/Factory/UserFactory.php
+++ b/app/Factory/UserFactory.php
@@ -28,7 +28,6 @@ class UserFactory
         $user->failed_logins = 0;
         $user->signature = '';
         $user->theme_id = 0;
-        $user->default_password_timeout = 30;
         
         return $user;
     }
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 8706ff03f8ca..16bc053a5a5a 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -86,6 +86,7 @@ class Company extends BaseModel
         'session_timeout',
         'oauth_password_required',
         'invoice_task_datelog',
+        'default_password_timeout',
     ];
 
     protected $hidden = [
diff --git a/app/Models/User.php b/app/Models/User.php
index 993293c83976..f9fb94e5b59f 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -82,7 +82,6 @@ class User extends Authenticatable implements MustVerifyEmail
         'custom_value4',
         'is_deleted',
         'google_2fa_secret',
-        'default_password_timeout',
     ];
 
     /**
diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php
index 3f9b34104fb7..308cf6cde8b7 100644
--- a/app/Transformers/CompanyTransformer.php
+++ b/app/Transformers/CompanyTransformer.php
@@ -154,6 +154,7 @@ class CompanyTransformer extends EntityTransformer
             'expense_amount_is_pretax' =>(bool)true, //@deprecate 1-2-2021
             'oauth_password_required' => (bool)$company->oauth_password_required,
             'session_timeout' => (int)$company->session_timeout,
+            'default_password_timeout' => (int) $company->default_password_timeout,
         ];
     }
 
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 2ae42bc187ca..2f79366abee3 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -37,7 +37,6 @@ class UserFactory extends Factory
             'email_verified_at' => now(),
             'password'          => bcrypt(config('ninja.testvars.password')), // secret
             'remember_token'    => \Illuminate\Support\Str::random(10),
-            'default_password_timeout' => 30,
         ];
     }
 }
diff --git a/database/migrations/2021_03_08_205030_add_russian_lang.php b/database/migrations/2021_03_08_205030_add_russian_lang.php
index 500e857fb020..443de5c73660 100644
--- a/database/migrations/2021_03_08_205030_add_russian_lang.php
+++ b/database/migrations/2021_03_08_205030_add_russian_lang.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Models\Company;
 use App\Models\Language;
 use App\Models\User;
 use Illuminate\Database\Migrations\Migration;
@@ -21,11 +22,11 @@ class AddRussianLang extends Migration
         Language::unguard();
         Language::create($russian);
 
-        Schema::table('users', function (Blueprint $table) {
+        Schema::table('companies', function (Blueprint $table) {
             $table->integer('default_password_timeout')->default(30);
         });
 
-        User::whereNotNull('id')->update(['default_password_timeout' => 30]);
+        Company::whereNotNull('id')->update(['default_password_timeout' => 30]);
 
     }