diff --git a/server/controllers/user/login.php b/server/controllers/user/login.php
index 54357d80..90bf90a1 100644
--- a/server/controllers/user/login.php
+++ b/server/controllers/user/login.php
@@ -5,6 +5,7 @@ class LoginController extends Controller {
 
     private $userInstance;
     private $session;
+    private $remembertoken;
     
     public function validations() {
         return [
@@ -19,8 +20,9 @@ class LoginController extends Controller {
             return;
         }
 
-        if ($this->areCredentialsValid()) {
+        if ($this->areCredentialsValid() || $this->isTokenValid()) {
             $this->createUserSession();
+            $this->createSessionCookie();
 
             Response::respondSuccess($this->getUserData());
         } else {
@@ -46,7 +48,8 @@ class LoginController extends Controller {
         return array(
             'userId' => $userInstance->id,
             'userEmail' => $userInstance->email,
-            'token' => $this->getSession()->getToken()
+            'token' => $this->getSession()->getToken(),
+            'rememberToken' => $this->remembertoken
         );
     }
 
@@ -68,4 +71,25 @@ class LoginController extends Controller {
 
         return $this->session;
     }
+    private function isTokenValid(){
+        $sessioncookie = SessionCookie::getDataStore(Controller::request('rememberToken'),'token');
+        if($sessioncookie !== null){
+            $this->userInstance = $sessioncookie->user;
+            return true;
+        }
+    }
+    private function createSessionCookie(){
+        $remember =  Controller::request('remember');
+        if($remember){
+            $this->remembertoken = md5(uniqid(rand()));
+
+            $sessioncookie = new SessionCookie();
+
+            $sessioncookie->setProperties(array(
+                'user' => $this->userInstance->getBeanInstance(),
+                'token' => $this->remembertoken
+            ));
+            $sessioncookie->store();
+        }
+    }
 }
diff --git a/server/models/SessionCookie.php b/server/models/SessionCookie.php
new file mode 100644
index 00000000..5817f659
--- /dev/null
+++ b/server/models/SessionCookie.php
@@ -0,0 +1,20 @@
+<?php
+
+class SessionCookie extends DataStore {
+    const TABLE = 'session';
+
+    public static function getProps() {
+        return array (
+            'user',
+            'token',
+            'ip',
+            'creationDate',
+            'expirationDate'
+        );
+
+    }
+
+    protected function getDefaultProps() {
+        return array();
+    }
+}
\ No newline at end of file