diff --git a/login.php b/login.php
index eb08bd7b..91cde5da 100644
--- a/login.php
+++ b/login.php
@@ -324,15 +324,15 @@ if (isset($_POST['login'])) {
                     </div>
                 </div>
 
+                <?php if (isset($token_field)) { echo $token_field; } ?>
+
                 <div class="form-group mb-3">
                     <div class="custom-control custom-checkbox">
-                        <input type="checkbox" class="custom-control-input" id="remember_me" name="remember_me">
+                        <input type="checkbox" class="custom-control-input" id="remember_me" name="remember_me" <?php if(isset($_POST['remember_me'])){ echo "checked"; } ?>>
                         <label class="custom-control-label" for="remember_me">Remember Me</label>
                     </div>
                 </div>
 
-                <?php if (isset($token_field)) { echo $token_field; } ?>
-
                 <button type="submit" class="btn btn-primary btn-block mb-3" name="login">Sign In</button>
 
                 <?php if($config_client_portal_enable == 1){ ?>