diff --git a/src/GoalioRememberMe/Form/Login.php b/src/GoalioRememberMe/Form/Login.php
index 0abe18f..61874b9 100644
--- a/src/GoalioRememberMe/Form/Login.php
+++ b/src/GoalioRememberMe/Form/Login.php
@@ -19,6 +19,9 @@ public function __construct($name = null, AuthenticationOptionsInterface $option
         $this->add(array(
             'type' => 'Zend\Form\Element\Checkbox',
             'name' => 'remember_me',
+            'attributes' => array(
+                'id' => 'remember_me'
+            ),
             'options' => array(
                 'label' => 'Stay logged in',
                 'use_hidden_element' => true,
diff --git a/src/GoalioRememberMe/Mapper/RememberMe.php b/src/GoalioRememberMe/Mapper/RememberMe.php
index 10e3f67..bad2934 100644
--- a/src/GoalioRememberMe/Mapper/RememberMe.php
+++ b/src/GoalioRememberMe/Mapper/RememberMe.php
@@ -30,7 +30,7 @@ public function findByIdSerie($userId, $serieId)
 
     public function updateSerie($entity)
     {
-        $where = 'user_id = ' . $entity->getUserId() . ' AND sid = "' . $entity->getSid() . '"';
+        $where = array('user_id' => $entity->getUserId(), 'sid' => $entity->getSid());
         $hydrator = new RememberMeHydrator;
         return parent::update($entity, $where, $this->tableName, $hydrator);
     }
@@ -43,19 +43,19 @@ public function createSerie($entity)
 
     public function removeAll($userId)
     {
-        $where = 'user_id = ' . $userId;
+        $where = array('user_id' => $userId);
         return parent::delete($where, $this->tableName);
     }
 
     public function remove($entity)
     {
-        $where = 'user_id = ' . $entity->getUserId() . ' AND sid = "' . $entity->getSid() . '" AND token = "' . $entity->getToken() . '"';
+        $where = array('user_id' => $entity->getUserId(), 'sid' => $entity->getSid(), 'token' => $entity->getToken());
         return parent::delete($where, $this->tableName);
     }
 
     public function removeSerie($userId, $serieId)
     {
-        $where = 'user_id = ' . $userId . ' AND sid = "' . $serieId . '"';
+        $where = array('user_id' => $userId, 'sid' => $serieId);
         return parent::delete($where, $this->tableName);
     }
 }
\ No newline at end of file