diff --git a/app/Http/Controllers/Contact/LoginController.php b/app/Http/Controllers/Contact/LoginController.php
index 0c11104e572b..92e00815e102 100644
--- a/app/Http/Controllers/Contact/LoginController.php
+++ b/app/Http/Controllers/Contact/LoginController.php
@@ -18,7 +18,7 @@ use App\Libraries\MultiDB;
 use App\Libraries\OAuth\OAuth;
 use App\Models\ClientContact;
 use App\Models\User;
-use App\Transformers\ClientContactTransformer;
+use App\Transformers\ClientContactLoginTransformer;
 use App\Transformers\UserTransformer;
 use App\Utils\Traits\UserSessionAttributes;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
@@ -45,7 +45,7 @@ class LoginController extends BaseController
 
     protected $entity_type = ClientContact::class;
 
-    protected $entity_transformer = ClientContactTransformer::class;
+    protected $entity_transformer = ClientContactLoginTransformer::class;
 
     /**
      * Where to redirect users after login.
@@ -89,12 +89,7 @@ class LoginController extends BaseController
      */
     public function apiLogin(Request $request)
     {
-     /*   
-        if (auth()->guard('contact')->attempt(['email' => $request->email, 'password' => $request->password], false) {
 
-            return redirect()->intended('/admin');
-        }
-*/
         Auth::shouldUse('contact');
 
         $this->validateLogin($request);
diff --git a/app/Models/ClientContact.php b/app/Models/ClientContact.php
index 36ffad06d5f0..e9613acd040f 100644
--- a/app/Models/ClientContact.php
+++ b/app/Models/ClientContact.php
@@ -29,16 +29,22 @@ class ClientContact extends Authenticatable
     use PresentableTrait;
     use SoftDeletes;
 
-   // protected $appends = ['contact_id'];
-
+    /* Used to authenticate a contact */
     protected $guard = 'contact';
 
+    /* Deprecated TODO remove*/
     protected $presenter = 'App\Models\Presenters\ClientContactPresenter';
 
     protected $dates = ['deleted_at'];
     
+    /* Allow microtime timestamps */
     protected $dateFormat = 'Y-m-d H:i:s.u';
 
+    protected $hidden = [
+        'password', 
+        'remember_token',
+    ];
+
 
     protected $fillable = [
         'first_name',
@@ -51,13 +57,8 @@ class ClientContact extends Authenticatable
         'email',
         'avatar',
     ];
-   
-    protected $hidden = [
-        'password', 
-        'remember_token',
-    ];
 
-    
+    /**/
     public function getRouteKeyName()
     {
         return 'contact_id';
diff --git a/app/Transformers/ClientContactTransformer.php b/app/Transformers/ClientContactTransformer.php
index ad4838029401..58c5059ca36d 100644
--- a/app/Transformers/ClientContactTransformer.php
+++ b/app/Transformers/ClientContactTransformer.php
@@ -30,6 +30,7 @@ class ClientContactTransformer extends EntityTransformer
      */
     public function transform(ClientContact $contact)
     {
+
         return [
             'id' => $this->encodePrimaryKey($contact->id),
             'first_name' => $contact->first_name ?: '',
@@ -38,9 +39,12 @@ class ClientContactTransformer extends EntityTransformer
             'updated_at' => $contact->updated_at,
             'archived_at' => $contact->deleted_at,
             'is_primary' => (bool) $contact->is_primary,
+            'is_locked' => (bool) $contact->is_locked,
             'phone' => $contact->phone ?: '',
             'custom_value1' => $contact->custom_value1 ?: '',
             'custom_value2' => $contact->custom_value2 ?: '',
+            'custom_value3' => $contact->custom_value3 ?: '',
+            'custom_value4' => $contact->custom_value4 ?: '',
         ];
     }
 }