diff --git a/app/Models/Company.php b/app/Models/Company.php
index e02d87f0b053..97f376d23170 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -83,6 +83,8 @@ class Company extends BaseModel
         'default_task_is_date_based',
         'enable_product_discount',
         'expense_inclusive_taxes',
+        'session_timeout',
+        'oauth_password_required',
     ];
 
     protected $hidden = [
diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php
index b0ea39bb5788..3f9b34104fb7 100644
--- a/app/Transformers/CompanyTransformer.php
+++ b/app/Transformers/CompanyTransformer.php
@@ -152,6 +152,8 @@ class CompanyTransformer extends EntityTransformer
             'hide_empty_columns_on_pdf' => false, // @deprecate 1-2-2021
             'expense_inclusive_taxes' => (bool)$company->expense_inclusive_taxes,
             'expense_amount_is_pretax' =>(bool)true, //@deprecate 1-2-2021
+            'oauth_password_required' => (bool)$company->oauth_password_required,
+            'session_timeout' => (int)$company->session_timeout,
         ];
     }
 
diff --git a/config/ninja.php b/config/ninja.php
index 257b18b6be95..e9d3de5f9522 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -140,4 +140,5 @@ return [
     'expanded_logging' => env('EXPANDED_LOGGING', false),
     'snappdf_chromium_path' => env('SNAPPDF_CHROMIUM_PATH', false),
     'v4_migration_version' => '4.5.31',
+    'flutter_canvas_kit' => env('FLUTTER_CANVAS_KIT', false),
 ];
diff --git a/database/migrations/2021_02_15_214724_additional_company_properties.php b/database/migrations/2021_02_15_214724_additional_company_properties.php
new file mode 100644
index 000000000000..2c76e3be117a
--- /dev/null
+++ b/database/migrations/2021_02_15_214724_additional_company_properties.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AdditionalCompanyProperties extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('companies', function(Blueprint $table){
+            $table->integer('session_timeout')->default(0);
+            $table->boolean('oauth_password_required')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}