diff --git a/framework/core/js/forum/dist/app.js b/framework/core/js/forum/dist/app.js
index dc6935d11..b0c583436 100644
--- a/framework/core/js/forum/dist/app.js
+++ b/framework/core/js/forum/dist/app.js
@@ -23875,10 +23875,10 @@ System.register('flarum/components/LogInButtons', ['flarum/Component', 'flarum/u
 });;
 'use strict';
 
-System.register('flarum/components/LogInModal', ['flarum/components/Modal', 'flarum/components/ForgotPasswordModal', 'flarum/components/SignUpModal', 'flarum/components/Alert', 'flarum/components/Button', 'flarum/components/LogInButtons', 'flarum/utils/extractText'], function (_export, _context) {
+System.register('flarum/components/LogInModal', ['flarum/components/Modal', 'flarum/components/ForgotPasswordModal', 'flarum/components/SignUpModal', 'flarum/components/Alert', 'flarum/components/Button', 'flarum/components/LogInButtons', 'flarum/components/Switch', 'flarum/utils/extractText'], function (_export, _context) {
   "use strict";
 
-  var Modal, ForgotPasswordModal, SignUpModal, Alert, Button, LogInButtons, extractText, LogInModal;
+  var Modal, ForgotPasswordModal, SignUpModal, Alert, Button, LogInButtons, Switch, extractText, LogInModal;
   return {
     setters: [function (_flarumComponentsModal) {
       Modal = _flarumComponentsModal.default;
@@ -23892,6 +23892,8 @@ System.register('flarum/components/LogInModal', ['flarum/components/Modal', 'fla
       Button = _flarumComponentsButton.default;
     }, function (_flarumComponentsLogInButtons) {
       LogInButtons = _flarumComponentsLogInButtons.default;
+    }, function (_flarumComponentsSwitch) {
+      Switch = _flarumComponentsSwitch.default;
     }, function (_flarumUtilsExtractText) {
       extractText = _flarumUtilsExtractText.default;
     }],
@@ -23965,10 +23967,14 @@ System.register('flarum/components/LogInModal', ['flarum/components/Modal', 'fla
                     disabled: this.loading })
                 ),
                 m(
-                  'label',
-                  { className: 'checkbox' },
-                  m('input', { name: 'remember', type: 'checkbox', bidi: this.remember, disabled: this.loading }),
-                  app.translator.trans('core.forum.log_in.remember_me_label')
+                  'div',
+                  { className: 'Form-group' },
+                  Switch.component({
+                    children: app.translator.trans('core.forum.log_in.remember_me_label'),
+                    disabled: this.loading,
+                    onchange: this.remember,
+                    state: this.remember()
+                  })
                 ),
                 m(
                   'div',
diff --git a/framework/core/js/forum/src/components/LogInModal.js b/framework/core/js/forum/src/components/LogInModal.js
index eb9b361c3..de5e23885 100644
--- a/framework/core/js/forum/src/components/LogInModal.js
+++ b/framework/core/js/forum/src/components/LogInModal.js
@@ -4,6 +4,7 @@ import SignUpModal from 'flarum/components/SignUpModal';
 import Alert from 'flarum/components/Alert';
 import Button from 'flarum/components/Button';
 import LogInButtons from 'flarum/components/LogInButtons';
+import Switch from 'flarum/components/Switch';
 import extractText from 'flarum/utils/extractText';
 
 /**
@@ -65,11 +66,15 @@ export default class LogInModal extends Modal {
               bidi={this.password}
               disabled={this.loading} />
           </div>
-
-          <label className="checkbox">
-            <input name="remember" type="checkbox" bidi={this.remember} disabled={this.loading} />
-            {app.translator.trans('core.forum.log_in.remember_me_label')}
-          </label>
+      
+          <div className="Form-group">
+            {Switch.component({
+             children: app.translator.trans('core.forum.log_in.remember_me_label'),
+             disabled: this.loading,
+             onchange: this.remember,
+             state: this.remember()
+            })}
+          </div>
 
           <div className="Form-group">
             {Button.component({