diff --git a/app/Factory/UserFactory.php b/app/Factory/UserFactory.php
index 7d7cc026324a..f246e85f3347 100644
--- a/app/Factory/UserFactory.php
+++ b/app/Factory/UserFactory.php
@@ -23,11 +23,11 @@ class UserFactory
 		$user->last_name = '';
 		$user->phone = '';
 		$user->email = '';
-		$user->theme_id = 0;
+		$user->last_login = now();
 		$user->failed_logins = 0;
 		$user->signature = '';
+		$user->theme_id = 0;
 
 		return $user;
 	}
-}
-
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 7be9d7d01088..1cb7a6013a28 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -21,6 +21,7 @@ use App\Http\Requests\User\ShowUserRequest;
 use App\Http\Requests\User\StoreUserRequest;
 use App\Http\Requests\User\UpdateUserRequest;
 use App\Models\User;
+use App\Repositories\UserRepository;
 use App\Transformers\UserTransformer;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Request;
@@ -39,11 +40,14 @@ class UserController extends BaseController
 
     protected $entity_transformer = UserTransformer::class;
 
-	public function __construct()
+    protected $user_repo;
+
+	public function __construct(UserRepository $user_repo)
     {
     
         parent::__construct();
 
+        $this->user_repo = $user_repo;
     }
     
     /**
@@ -78,10 +82,22 @@ class UserController extends BaseController
      */
     public function store(StoreUserRequest $request)
     {
+        $company = auth()->user()->company();
         //save user
-        
+        $user = $this->user_repo->save($request->all(), UserFactory::create($company->id, auth()->user()->id));
 
-        //attach user to company
+        $user->companies()->attach($company->id, [
+            'account_id' => $company->account->id,
+            'is_owner' => 0,
+            'is_admin' => $request->input('is_admin'),
+            'is_locked' => 0,
+            'permissions' => $request->input('permissions'),
+            'settings' => $request->input('settings'),
+        ]);
+
+        $user->load('companies');
+        
+        return $this->itemResponse($user);
         
     }
 
@@ -120,7 +136,10 @@ class UserController extends BaseController
      */
     public function update(UpdateUserRequest $request, User $user)
     {
-        //
+        $user = $this->user_repo->save($request->all(), $user);
+
+        return $this->itemResponse($user);
+
     }
 
     /**
@@ -129,9 +148,11 @@ class UserController extends BaseController
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function destroy(DestroyUserRequest $request)
+    public function destroy(DestroyUserRequest $request, User $user)
     {
-        //
+        $user->delete();
+
+        return response()->json([], 200);
     }
 
 }
diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php
new file mode 100644
index 000000000000..128617296710
--- /dev/null
+++ b/app/Repositories/UserRepository.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Repositories;
+
+use App\Models\User;
+use Illuminate\Http\Request;
+
+/**
+ * UserRepository
+ */
+class UserRepository extends BaseRepository
+{
+
+    public function __construct()
+    {
+
+
+    }
+
+    /**
+     * Gets the class name.
+     *
+     * @return     string The class name.
+     */
+    public function getClassName()
+    {
+
+        return User::class;
+
+    }
+
+	/**
+     * Saves the user and its contacts
+     *
+     * @param      array                         $data    The data
+     * @param      \App\Models\user              $user  The user
+     *
+     * @return     user|\App\Models\user|null  user Object
+     */
+    public function save(array $data, User $user) : ?user
+	{
+
+        $user->fill($data);
+
+        $user->save();
+
+        return $user;
+        
+	}
+
+}
\ No newline at end of file