3 files changed, 20 insertions, 0 deletions
diff --git a/web/app/view/Login.js b/web/app/view/Login.js
index 4f04a0f37..085f853be 100644
--- a/web/app/view/Login.js
+++ b/web/app/view/Login.js
@@ -54,6 +54,7 @@ Ext.define('Traccar.view.Login', {
         }, {
             xtype: 'textfield',
             name: 'email',
+            id: 'txtUser',
             fieldLabel: Strings.userEmail,
             allowBlank: false,
             enableKeyEvents: true,
@@ -65,6 +66,7 @@ Ext.define('Traccar.view.Login', {
         }, {
             xtype: 'textfield',
             name: 'password',
+            id: 'txtPassword',
             fieldLabel: Strings.userPassword,
             inputType: 'password',
             allowBlank: false,
@@ -74,6 +76,10 @@ Ext.define('Traccar.view.Login', {
             },
             inputAttrTpl: ['autocomplete="on"']
         }, {
+            xtype: 'checkboxfield',
+            id: 'chkRememberMe',
+            fieldLabel: Strings.rememberMe
+        }, {
             xtype: 'component',
             html: '<iframe id="submitTarget" name="submitTarget" style="display:none"></iframe>'
         }, {
diff --git a/web/app/view/LoginController.js b/web/app/view/LoginController.js
index 3dd8af082..3b4fc8754 100644
--- a/web/app/view/LoginController.js
+++ b/web/app/view/LoginController.js
@@ -26,6 +26,13 @@ Ext.define('Traccar.view.LoginController', {
         this.lookupReference('registerButton').setDisabled(
             !Traccar.app.getServer().get('registration'));
         this.lookupReference('languageField').setValue(Locale.language);
+        var user = Ext.util.Cookies.get('user');
+        var pass = Ext.util.Cookies.get('pass');
+        if (user && pass) {
+            Ext.getCmp('txtUser').setValue(user);
+            Ext.getCmp('txtPassword').setValue(pass);
+            this.login();
+        }
     },
 
     login: function () {
@@ -40,6 +47,10 @@ Ext.define('Traccar.view.LoginController', {
                 callback: function (options, success, response) {
                     Ext.getBody().unmask();
                     if (success) {
+                        if (Ext.getCmp('chkRememberMe').getValue()) {
+                            Ext.util.Cookies.set('user', Ext.getCmp('txtUser').getValue(), Ext.Date.add(new Date(), Ext.Date.YEAR, 1));
+                            Ext.util.Cookies.set('pass', Ext.getCmp('txtPassword').getValue(), Ext.Date.add(new Date(), Ext.Date.YEAR, 1));
+                        }
                         Traccar.app.setUser(Ext.decode(response.responseText));
                         this.fireViewEvent('login');
                     } else {
@@ -51,6 +62,8 @@ Ext.define('Traccar.view.LoginController', {
     },
 
     logout: function () {
+        Ext.util.Cookies.clear('user');
+        Ext.util.Cookies.clear('pass');
         Ext.Ajax.request({
             scope: this,
             method: 'DELETE',
diff --git a/web/l10n/en.json b/web/l10n/en.json
index e1866fe62..c64d06b45 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -30,6 +30,7 @@
     "userEmail": "Email",
     "userPassword": "Password",
     "userAdmin": "Admin",
+    "rememberMe": "Remember Me",
     "loginTitle": "Login",
     "loginLanguage": "Language",
     "loginRegister": "Register",