3 files changed, 7 insertions, 12 deletions

diff --git a/src/CamilStaps/BotleaguesApi/Database/PasswordReminder.php b/src/CamilStaps/BotleaguesApi/Database/PasswordReminder.php
index 803d7e8..e0c856a 100644
--- a/src/CamilStaps/BotleaguesApi/Database/PasswordReminder.php
+++ b/src/CamilStaps/BotleaguesApi/Database/PasswordReminder.php
@@ -28,6 +28,7 @@ class PasswordReminder extends Model {
     protected $hidden = ['token'];
     protected $fillable = ['userEmail', 'token', 'valid_till'];
     protected $primaryKey = 'token';
+    public $incrementing = false;
 
     public static function boot() {
         parent::boot();
diff --git a/src/CamilStaps/BotleaguesApi/Database/User.php b/src/CamilStaps/BotleaguesApi/Database/User.php
index c0a25b0..017f0e2 100644
--- a/src/CamilStaps/BotleaguesApi/Database/User.php
+++ b/src/CamilStaps/BotleaguesApi/Database/User.php
@@ -35,6 +35,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
 	protected $hidden = ['password', 'remember_token', 'api_key'];
     protected $fillable = ['email', 'password'];
     protected $primaryKey = 'email';
+    public $incrementing = false;
 
     public function isAdministrator() {
         return (bool) $this->isAdministrator;
@@ -117,26 +118,20 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     }
 
     public function setEmailAttribute($email) {
-        $rules = [
-            'email' => ['required', 'email', 'unique:' . $this->table]
-        ];
-        $validator = Validator::make(['email' => $email], $rules);
+        $validator = Validator::make(['email' => $email], ['email' => ['required', 'email', 'unique:' . $this->table]]);
         if ($validator->fails()) {
-            throw new ValidationException('Invalid input', $validator->errors());
+            throw new ValidationException('Invalid input email', $validator->errors());
         }
 
-        $this->attributes['email'] = $email;
+        return $this->attributes['email'] = $email;
     }
 
     public function setPasswordAttribute($password) {
-        $rules = [
-            'password' => ['required', 'min:7']
-        ];
-        $validator = Validator::make(['password' => $password], $rules);
+        $validator = Validator::make(['password' => $password], ['password' => ['required', 'min:7']]);
         if ($validator->fails()) {
             throw new ValidationException('Invalid input', $validator->errors());
         }
 
-        $this->attributes['password'] = Hash::make($password);
+        return $this->attributes['password'] = Hash::make($password);
     }
 }
\ No newline at end of file
diff --git a/src/controllers/UserController.php b/src/controllers/UserController.php
index 6a601b4..f6f9562 100644
--- a/src/controllers/UserController.php
+++ b/src/controllers/UserController.php
@@ -20,7 +20,6 @@
 namespace CamilStaps\BotleaguesApi\Controllers;
 
 use CamilStaps\BotleaguesApi\Database\User;
-use CamilStaps\BotleaguesApi\Exception\ValidationException;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Input;