diff --git a/assets/php/utils.php b/assets/php/utils.php
index ab2af50..7c9fd3e 100644
--- a/assets/php/utils.php
+++ b/assets/php/utils.php
@@ -1,7 +1,7 @@
 <?php
 
 $SESSION_COOKIE_NAME = "connection_id";
-$MAX_COOKIE_LIFE = time() + 86400 * 30; // 30 days max
+$MAX_COOKIE_LIFE = 86400 * 30; // 30 days max
 $MINIMAL_PASSWORD_LENGTH = 8;
 
 $config_array = json_decode(file_get_contents("config.json", true));
diff --git a/login.php b/login.php
index f517f8e..b348f38 100644
--- a/login.php
+++ b/login.php
@@ -35,7 +35,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         if (get_username_count($username) == 1) {
             if (correct_email_password($username, $password)) {
                 if (is_https()) {
-                    connect_user(get_user_id_from_email($username), false);
+                    connect_user(get_user_id_from_email($username), isset($_POST["stay_loggedin"]));
 
                     // Redirect user to welcome page
                     header("location: welcome.php");
@@ -86,6 +86,10 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
                 <input type="password" name="password" class="form-control">
                 <span class="help-block"><?php echo $password_err; ?></span>
             </div>
+            <div>
+                <label>Remember me</label>
+                <input type="checkbox" name="stay_loggedin"/>
+            </div>
             <div class="form-group">
                 <input type="submit" class="btn btn-primary" value="Login">
             </div>