diff --git a/app/Models/Client.php b/app/Models/Client.php
index f5f2b8374ca2..8b43dda39827 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -151,6 +151,22 @@ class Client extends BaseModel
         return ClientSettings::buildClientSettings(new CompanySettings($this->company->settings), new ClientSettings($this->settings));
     }
 
+    public function getSetting($setting)
+    {
+        //check client level first
+        if(property_exists($this->settings, $setting) && isset($this->settings->{$setting}))
+            return $this->settings->{$setting};
+
+        //check group level (if a group is assigned)
+        if($this->group_settings && property_exists($this->group_settings, $setting) && isset($this->group_settings->{$setting}))
+            return $this->group_settings->{$setting};
+        
+        //check company level
+
+    
+        
+    }
+
     public function documents()
     {
         return $this->morphMany(Document::class, 'documentable');
diff --git a/tests/Feature/LoginTest.php b/tests/Feature/LoginTest.php
index 093ff194dba6..0dc42d7692ed 100644
--- a/tests/Feature/LoginTest.php
+++ b/tests/Feature/LoginTest.php
@@ -139,12 +139,12 @@ class LoginTest extends TestCase
         $user = factory(User::class)->create([
          //   'account_id' => $account->id,
             'email' => 'test@example.com',
-            'password' => '123456'
+            'password' => \Hash::make('123456')
         ]);
 
         $company = factory(\App\Models\Company::class)->make([
             'account_id' => $account->id,
-                        'domain' => 'ninja.test',
+            'domain' => 'ninja.test',
 
         ]);