diff --git a/app/Models/Account.php b/app/Models/Account.php
index bbe026266a64..f944a6abf3ce 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -1,4 +1,4 @@
-<?php
+<?php  namespace App\Models;
 
 class Account extends Eloquent
 {
diff --git a/app/Models/AccountGateway.php b/app/Models/AccountGateway.php
index 002bc830795e..628e17479371 100644
--- a/app/Models/AccountGateway.php
+++ b/app/Models/AccountGateway.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class AccountGateway extends EntityModel
 {
diff --git a/app/Models/AccountGatewayToken.php b/app/Models/AccountGatewayToken.php
index ae63d6c2d2cd..a1d18291b28e 100644
--- a/app/Models/AccountGatewayToken.php
+++ b/app/Models/AccountGatewayToken.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class AccountGatewayToken extends Eloquent
 {
diff --git a/app/Models/AccountToken.php b/app/Models/AccountToken.php
index dea1f1d19a77..b267ee43b065 100644
--- a/app/Models/AccountToken.php
+++ b/app/Models/AccountToken.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class AccountToken extends EntityModel
 {
diff --git a/app/Models/Activity.php b/app/Models/Activity.php
index 9fe82178c612..77e9acfdd85c 100644
--- a/app/Models/Activity.php
+++ b/app/Models/Activity.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Activity extends Eloquent
 {
diff --git a/app/Models/Affiliate.php b/app/Models/Affiliate.php
index 3efccbd1ada0..f88b96c3fc1e 100644
--- a/app/Models/Affiliate.php
+++ b/app/Models/Affiliate.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Affiliate extends Eloquent
 {
diff --git a/app/Models/Client.php b/app/Models/Client.php
index df723de8fc77..d4654919bb36 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Client extends EntityModel
 {
diff --git a/app/Models/Contact.php b/app/Models/Contact.php
index ca29ce31b9f5..425d8b0eb709 100644
--- a/app/Models/Contact.php
+++ b/app/Models/Contact.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Contact extends EntityModel
 {
diff --git a/app/Models/Country.php b/app/Models/Country.php
index 05364b4e3529..e66398e03fab 100644
--- a/app/Models/Country.php
+++ b/app/Models/Country.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Country extends Eloquent
 {
diff --git a/app/Models/Credit.php b/app/Models/Credit.php
index d8efd31c6b65..77cc11fcfc55 100644
--- a/app/Models/Credit.php
+++ b/app/Models/Credit.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Credit extends EntityModel
 {
diff --git a/app/Models/Currency.php b/app/Models/Currency.php
index 943816064607..b75184a59efc 100644
--- a/app/Models/Currency.php
+++ b/app/Models/Currency.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Currency extends Eloquent
 {
diff --git a/app/Models/DateFormat.php b/app/Models/DateFormat.php
index 0337c63ae011..2bcc2a7abf1d 100644
--- a/app/Models/DateFormat.php
+++ b/app/Models/DateFormat.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class DateFormat extends Eloquent
 {
diff --git a/app/Models/DatetimeFormat.php b/app/Models/DatetimeFormat.php
index 9ab3a8eb4675..9e8d4e37dfa1 100644
--- a/app/Models/DatetimeFormat.php
+++ b/app/Models/DatetimeFormat.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class DatetimeFormat extends Eloquent
 {
diff --git a/app/Models/EntityModel.php b/app/Models/EntityModel.php
index 412ed78469f7..e9e34cd00927 100644
--- a/app/Models/EntityModel.php
+++ b/app/Models/EntityModel.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class EntityModel extends Eloquent
 {
diff --git a/app/Models/Frequency.php b/app/Models/Frequency.php
index 84373222ae62..58024d31b556 100644
--- a/app/Models/Frequency.php
+++ b/app/Models/Frequency.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Frequency extends Eloquent
 {
diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php
index 1f4d6e0a7e21..4578f6020ca5 100644
--- a/app/Models/Gateway.php
+++ b/app/Models/Gateway.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Gateway extends Eloquent
 {
diff --git a/app/Models/Industry.php b/app/Models/Industry.php
index 4c931a520d8f..ab2dc2768664 100644
--- a/app/Models/Industry.php
+++ b/app/Models/Industry.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Industry extends Eloquent
 {
diff --git a/app/Models/Invitation.php b/app/Models/Invitation.php
index 0100f75d96f7..dc0ea2c46f56 100644
--- a/app/Models/Invitation.php
+++ b/app/Models/Invitation.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Invitation extends EntityModel
 {
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 09e1f887d34d..fc3699b0e83e 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Invoice extends EntityModel
 {
diff --git a/app/Models/InvoiceDesign.php b/app/Models/InvoiceDesign.php
index 6dfd823dae02..5779f329521a 100644
--- a/app/Models/InvoiceDesign.php
+++ b/app/Models/InvoiceDesign.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class InvoiceDesign extends Eloquent
 {
diff --git a/app/Models/InvoiceItem.php b/app/Models/InvoiceItem.php
index 36f8b5694097..bd8c043afaa0 100644
--- a/app/Models/InvoiceItem.php
+++ b/app/Models/InvoiceItem.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class InvoiceItem extends EntityModel
 {
diff --git a/app/Models/InvoiceStatus.php b/app/Models/InvoiceStatus.php
index faca90e50bcf..14e8609e9c30 100644
--- a/app/Models/InvoiceStatus.php
+++ b/app/Models/InvoiceStatus.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class InvoiceStatus extends Eloquent
 {
diff --git a/app/Models/Language.php b/app/Models/Language.php
index e2843e2edc49..eeb9a423a448 100644
--- a/app/Models/Language.php
+++ b/app/Models/Language.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Language extends Eloquent
 {
diff --git a/app/Models/License.php b/app/Models/License.php
index 1dfa5610cca6..c5601ccdbdae 100644
--- a/app/Models/License.php
+++ b/app/Models/License.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class License extends Eloquent
 {
diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index e71d50afb893..e05ce69e0079 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Payment extends EntityModel
 {
diff --git a/app/Models/PaymentLibrary.php b/app/Models/PaymentLibrary.php
index c6eff7009159..941d0cf3e011 100644
--- a/app/Models/PaymentLibrary.php
+++ b/app/Models/PaymentLibrary.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class PaymentLibrary extends Eloquent
 {
diff --git a/app/Models/PaymentTerm.php b/app/Models/PaymentTerm.php
index 15669d6535d3..8a9a9777abe9 100644
--- a/app/Models/PaymentTerm.php
+++ b/app/Models/PaymentTerm.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class PaymentTerm extends Eloquent
 {
diff --git a/app/Models/PaymentType.php b/app/Models/PaymentType.php
index a44e66763bd3..d8209f2df09e 100644
--- a/app/Models/PaymentType.php
+++ b/app/Models/PaymentType.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class PaymentType extends Eloquent
 {
diff --git a/app/Models/Product.php b/app/Models/Product.php
index 3067be7ef5b8..49f0a8735cad 100644
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Product extends EntityModel
 {
diff --git a/app/Models/Project.php b/app/Models/Project.php
index 6a2042e87ab9..79cf9bf8ce09 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -1,4 +1,7 @@
-<?php
+<?php namespace App\Models;
+
+use Auth;
+use Utils;
 
 class Project extends Eloquent
 {
diff --git a/app/Models/ProjectCode.php b/app/Models/ProjectCode.php
index 3f3f344a5e0b..c1a999f88ca7 100644
--- a/app/Models/ProjectCode.php
+++ b/app/Models/ProjectCode.php
@@ -1,4 +1,7 @@
-<?php
+<?php namespace App\Models;
+
+use Auth;
+use Utils;
 
 class ProjectCode extends Eloquent
 {
diff --git a/app/Models/Size.php b/app/Models/Size.php
index a598c7732d01..da88ee980488 100644
--- a/app/Models/Size.php
+++ b/app/Models/Size.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Size extends Eloquent
 {
diff --git a/app/Models/Subscription.php b/app/Models/Subscription.php
index e9d0c9a321eb..08bd5f21936d 100644
--- a/app/Models/Subscription.php
+++ b/app/Models/Subscription.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Subscription extends Eloquent
 {
diff --git a/app/Models/TaxRate.php b/app/Models/TaxRate.php
index 474ad5c1b52d..88811134be4b 100644
--- a/app/Models/TaxRate.php
+++ b/app/Models/TaxRate.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class TaxRate extends EntityModel
 {
diff --git a/app/Models/Theme.php b/app/Models/Theme.php
index 86e73a35f18f..ed55b82f3c0c 100644
--- a/app/Models/Theme.php
+++ b/app/Models/Theme.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Theme extends Eloquent
 {
diff --git a/app/Models/Timesheet.php b/app/Models/Timesheet.php
index 3cf18f027954..bb946305d817 100644
--- a/app/Models/Timesheet.php
+++ b/app/Models/Timesheet.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Timesheet extends Eloquent
 {
diff --git a/app/Models/TimesheetEvent.php b/app/Models/TimesheetEvent.php
index 448ac40c9b5a..d668968687bb 100644
--- a/app/Models/TimesheetEvent.php
+++ b/app/Models/TimesheetEvent.php
@@ -1,4 +1,7 @@
-<?php
+<?php namespace App\Models;
+
+use Auth;
+use Utils;
 
 class TimesheetEvent extends Eloquent
 {
diff --git a/app/Models/TimesheetEventSource.php b/app/Models/TimesheetEventSource.php
index fcca52c61f79..52c64a58014e 100644
--- a/app/Models/TimesheetEventSource.php
+++ b/app/Models/TimesheetEventSource.php
@@ -1,4 +1,7 @@
-<?php
+<?php namespace App\Models;
+
+use Auth;
+use Utils;
 
 class TimesheetEventSource extends Eloquent
 {
diff --git a/app/Models/Timezone.php b/app/Models/Timezone.php
index 09b91108a4b4..fc4412c915b2 100644
--- a/app/Models/Timezone.php
+++ b/app/Models/Timezone.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Timezone extends Eloquent
 {
diff --git a/app/Models/User.php b/app/Models/User.php
index b7ae32d241d6..86c5aeda0e21 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -1,28 +1,17 @@
-<?php
+<?php namespace App\Models;
 
-use Illuminate\Auth\UserInterface;
-use Illuminate\Auth\Reminders\RemindableInterface;
-use Zizaco\Confide\ConfideUser;
+use Illuminate\Auth\Authenticatable;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Auth\Passwords\CanResetPassword;
+use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
+use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
+
+class User extends Model implements AuthenticatableContract, CanResetPasswordContract {
+
+    use Authenticatable, CanResetPassword;
 
-class User extends ConfideUser implements UserInterface, RemindableInterface
-{
     protected $softDelete = true;
 
-    public static $rules = array(
-        /*
-    	'username' => 'required|unique:users',
-        'password' => 'required|between:6,32|confirmed',
-        'password_confirmation' => 'between:6,32',
-        */
-    );
-
-    protected $updateRules = array(
-        /*
-        'email' => 'required|unique:users',
-        'username' => 'required|unique:users',
-        */
-    );
-
     /**
      * The database table used by the model.
      *
@@ -30,6 +19,22 @@ class User extends ConfideUser implements UserInterface, RemindableInterface
      */
     protected $table = 'users';
 
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = ['email', 'password','agency_id'];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    protected $hidden = ['password', 'remember_token'];
+
+
     public function account()
     {
         return $this->belongsTo('Account');