diff --git a/App/Controllers/Home.php b/App/Controllers/Home.php
index 7eae6e0..650c8a0 100644
--- a/App/Controllers/Home.php
+++ b/App/Controllers/Home.php
@@ -85,11 +85,21 @@ class Home
 
     public function put($args = [])
     {
-        if ($this->access->login($args)) {
+        if ($user = $this->access->login($args)) {
+            Session::put('userid', $user['id']);
+            Session::put('username', $user['username']);
+            Session::put('full_name', $user['full_name']);
+            Session::put('privilage', $user['privilage']);
+
             $table = 'user';
             $id = Session::get('userid');
 
-            $this->access->update($table, ['status' => 1], $id);
+            if ($this->access->update($table, ['status' => 1], $id)) {
+                $username = Session::get('username');
+                Session::flash('info', "$username logged in");
+            }
+        } else {
+            Session::flash('info', 'Invalid username/password');
         }
         Redirect::to('/');
     }
diff --git a/App/Models/Access.php b/App/Models/Access.php
index bd1e925..544e4a9 100644
--- a/App/Models/Access.php
+++ b/App/Models/Access.php
@@ -83,20 +83,11 @@ class Access extends \Core\Model
                     if (\Core\Hash::compare($password, $salt, $hash)) {
                         $user = $this->showSingle($id);
 
-                        \Core\Session::put('userid', $user['id']);
-                        \Core\Session::put('username', $user['username']);
-                        \Core\Session::put('full_name', $user['full_name']);
-                        \Core\Session::put('privilage', $user['privilage']);
-
-                        $user_now = $user['username'];
-
-                        \Core\Session::flash('info', "$user_now logged in");
-
-                        return true;
+                        return $user;
                     }
+                    return false;
                 }
             }
-            \Core\Session::flash('info', 'Invalid username/password');
         } catch (PDOException $e) {
             throw new \Exception($e->getMessage(), 444);
         }