diff --git a/.travis.yml b/.travis.yml
index 68221f34cde1..289e7be2a267 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -78,7 +78,7 @@ before_script:
 
 script:
   - php ./vendor/bin/phpunit --debug --verbose --coverage-clover=coverage.xml
-  - php artisan dusk
+  # php artisan dusk
   - npm test
 after_success:
     - bash <(curl -s https://codecov.io/bash)
diff --git a/app/Constants.php b/app/Constants.php
index 40fdd0aa2981..f0c6f72d7c39 100644
--- a/app/Constants.php
+++ b/app/Constants.php
@@ -10,7 +10,6 @@
 
 
 define('BANK_LIBRARY_OFX', 1);
-define('RANDOM_KEY_LENGTH', 32); //63340286662973277706162286946811886609896461828096 combinations
 
 
 $cached_tables = [
diff --git a/app/Utils/Traits/MakesHash.php b/app/Utils/Traits/MakesHash.php
index c888fa2bf462..8e331ef4728a 100644
--- a/app/Utils/Traits/MakesHash.php
+++ b/app/Utils/Traits/MakesHash.php
@@ -17,7 +17,7 @@ trait MakesHash
      */
     public function createHash() : string
     {
-        return strtolower(str_random(RANDOM_KEY_LENGTH));
+        return str_random(config('ninja.key_length'));
     }
 
     /**
@@ -28,7 +28,7 @@ trait MakesHash
      */
     public function createDbHash($db) : string
     {
-        return  $this->getDbCode($db) . '-' . strtolower(str_random(RANDOM_KEY_LENGTH));
+        return  $this->getDbCode($db) . '-' . str_random(config('ninja.key_length'));
     }
 
     /**
diff --git a/config/ninja.php b/config/ninja.php
index b80009de757e..5de418edea6a 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -12,6 +12,7 @@ return [
     'app_env' => env('APP_ENV', 'development'),
     'api_secret' => env('API_SECRET', ''),
     'google_maps_api_key' => env('GOOGLE_MAPS_API_KEY'),
+    'key_length' => 64,
 
     'environment' => env('NINJA_ENVIRONMENT', 'selfhost'), // 'hosted', 'development', 'selfhost', 'reseller'
 
diff --git a/database/factories/CompanyFactory.php b/database/factories/CompanyFactory.php
index d6cd7e192bf7..c55cbd00a7b7 100644
--- a/database/factories/CompanyFactory.php
+++ b/database/factories/CompanyFactory.php
@@ -6,7 +6,7 @@ use Faker\Generator as Faker;
 $factory->define(App\Models\Company::class, function (Faker $faker) {
     return [
         'name' => $faker->name,
-        'company_key' => strtolower(str_random(RANDOM_KEY_LENGTH)),
+        'company_key' => strtolower(str_random(config('ninja.key_length'))),
         'ip' => $faker->ipv4,
         'db' => config('database.default'),
         'settings' => new CompanySettings(CompanySettings::defaults()),