diff --git a/messages.pot b/messages.pot
index 58eaf01..bf3c95a 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-10-20 23:30+0200\n"
+"POT-Creation-Date: 2021-10-26 23:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1334,7 +1334,7 @@ msgstr ""
 msgid "Manage"
 msgstr ""
 
-#: project/templates/home.html:30 project/templates/security/login_user.html:35
+#: project/templates/home.html:30 project/templates/security/login_user.html:38
 #: project/views/widget.py:158
 msgid "Register for free"
 msgstr ""
@@ -1893,7 +1893,11 @@ msgstr ""
 msgid "This will allow \"%(client_name)s\" to:"
 msgstr ""
 
-#: project/templates/security/login_user.html:33
+#: project/templates/security/login_user.html:27
+msgid "Remember me"
+msgstr ""
+
+#: project/templates/security/login_user.html:36
 msgid "You do not have an account yet? Not a problem!"
 msgstr ""
 
@@ -1921,7 +1925,7 @@ msgstr ""
 msgid "Organization successfully updated"
 msgstr ""
 
-#: project/views/admin.py:68 project/views/manage.py:317
+#: project/views/admin.py:68 project/views/manage.py:318
 msgid "Settings successfully updated"
 msgstr ""
 
@@ -1935,15 +1939,15 @@ msgid ""
 "test phase. If you are interested, you can contact us."
 msgstr ""
 
-#: project/views/admin_unit.py:115
+#: project/views/admin_unit.py:119
 msgid "Organization successfully created"
 msgstr ""
 
-#: project/views/admin_unit.py:145
+#: project/views/admin_unit.py:149
 msgid "AdminUnit successfully updated"
 msgstr ""
 
-#: project/views/admin_unit.py:167
+#: project/views/admin_unit.py:171
 msgid "Organization invitation accepted"
 msgstr ""
 
@@ -2134,22 +2138,22 @@ msgid ""
 "verified automatically."
 msgstr ""
 
-#: project/views/utils.py:76
+#: project/views/utils.py:77
 msgid ""
 "An entry with the entered values ​​already exists. Duplicate entries are "
 "not allowed."
 msgstr ""
 
-#: project/views/utils.py:127
+#: project/views/utils.py:128
 #, python-format
 msgid "Error in the %s field - %s"
 msgstr ""
 
-#: project/views/utils.py:134
+#: project/views/utils.py:135
 msgid "Show"
 msgstr ""
 
-#: project/views/utils.py:141
+#: project/views/utils.py:142
 msgid "You do not have permission for this action"
 msgstr ""
 
diff --git a/project/__init__.py b/project/__init__.py
index 466f11c..44c6239 100644
--- a/project/__init__.py
+++ b/project/__init__.py
@@ -26,7 +26,6 @@ app.config["SECURITY_SEND_REGISTER_EMAIL"] = True
 app.config["SECURITY_RECOVERABLE"] = True
 app.config["SECURITY_CHANGEABLE"] = True
 app.config["SECURITY_EMAIL_SENDER"] = os.getenv("MAIL_DEFAULT_SENDER")
-app.config["SECURITY_DEFAULT_REMEMBER_ME"] = True
 app.config["LANGUAGES"] = ["en", "de"]
 app.config["SERVER_NAME"] = os.getenv("SERVER_NAME")
 app.config["ADMIN_UNIT_CREATE_REQUIRES_ADMIN"] = os.getenv(
diff --git a/project/templates/security/login_user.html b/project/templates/security/login_user.html
index 7549772..feff6a1 100644
--- a/project/templates/security/login_user.html
+++ b/project/templates/security/login_user.html
@@ -22,7 +22,10 @@
   {{ render_field_with_errors(login_user_form.email) }}
   {{ render_field_with_errors(login_user_form.password) }}
 
-  <input id="{{ login_user_form.remember.id }}" name="{{ login_user_form.remember.name }}" type="hidden" value="{{ login_user_form.remember.default }}" />
+  <div class="form-group form-check">
+    {{ login_user_form.remember(class="form-check-input")|safe }}
+    <label class="form-check-label" for="remember">{{ _('Remember me') }}</label>
+  </div>
 
   {{ render_field_errors(login_user_form.csrf_token) }}
   {{ render_field(login_user_form.submit) }}
diff --git a/project/translations/de/LC_MESSAGES/messages.mo b/project/translations/de/LC_MESSAGES/messages.mo
index 313ea3d..a51a8b3 100644
Binary files a/project/translations/de/LC_MESSAGES/messages.mo and b/project/translations/de/LC_MESSAGES/messages.mo differ
diff --git a/project/translations/de/LC_MESSAGES/messages.po b/project/translations/de/LC_MESSAGES/messages.po
index dd94600..4c53367 100644
--- a/project/translations/de/LC_MESSAGES/messages.po
+++ b/project/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-10-20 23:30+0200\n"
+"POT-Creation-Date: 2021-10-26 23:29+0200\n"
 "PO-Revision-Date: 2020-06-07 18:51+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -378,7 +378,9 @@ msgstr "Neue Organisation verifizieren"
 
 #: project/forms/admin_unit.py:66
 msgid "If set, events of the new organization are publicly visible."
-msgstr "Wenn gesetzt, sind Veranstaltungen der neuen Organisation öffentlich sichtbar."
+msgstr ""
+"Wenn gesetzt, sind Veranstaltungen der neuen Organisation öffentlich "
+"sichtbar."
 
 #: project/forms/admin_unit.py:72 project/forms/reference_request.py:86
 msgid "Verify reference requests automatically"
@@ -388,7 +390,9 @@ msgstr "Empfehlungsanfragen automatisch verifizieren"
 msgid ""
 "If set, all upcoming reference requests of the new organization are "
 "verified automatically."
-msgstr "Wenn gesetzt, werden alle zukünftigen Empfehlungsanfragen der neuen Organisation automatisch verifiziert."
+msgstr ""
+"Wenn gesetzt, werden alle zukünftigen Empfehlungsanfragen der neuen "
+"Organisation automatisch verifiziert."
 
 #: project/forms/admin_unit.py:84 project/templates/admin_unit/create.html:5
 #: project/templates/admin_unit/create.html:22
@@ -1378,7 +1382,7 @@ msgstr "Anderer Kalender"
 msgid "Manage"
 msgstr "Verwaltung"
 
-#: project/templates/home.html:30 project/templates/security/login_user.html:35
+#: project/templates/home.html:30 project/templates/security/login_user.html:38
 #: project/views/widget.py:158
 msgid "Register for free"
 msgstr "Kostenlos registrieren"
@@ -1943,7 +1947,11 @@ msgstr "\"%(client_name)s\" möchte auf deinen Account zugreifen"
 msgid "This will allow \"%(client_name)s\" to:"
 msgstr "Dies ermöglicht \"%(client_name)s\":"
 
-#: project/templates/security/login_user.html:33
+#: project/templates/security/login_user.html:27
+msgid "Remember me"
+msgstr "Angemeldet bleiben"
+
+#: project/templates/security/login_user.html:36
 msgid "You do not have an account yet? Not a problem!"
 msgstr "Du hast noch keinen Account? Kein Problem!"
 
@@ -1971,7 +1979,7 @@ msgstr "Vorschau"
 msgid "Organization successfully updated"
 msgstr "Organisation erfolgreich aktualisiert"
 
-#: project/views/admin.py:68 project/views/manage.py:317
+#: project/views/admin.py:68 project/views/manage.py:318
 msgid "Settings successfully updated"
 msgstr "Einstellungen erfolgreich aktualisiert"
 
@@ -1988,15 +1996,15 @@ msgstr ""
 " sich in einer geschlossenen Test-Phase. Bei Interesse kannst du uns "
 "kontaktieren."
 
-#: project/views/admin_unit.py:115
+#: project/views/admin_unit.py:119
 msgid "Organization successfully created"
 msgstr "Organisation erfolgreich erstellt"
 
-#: project/views/admin_unit.py:145
+#: project/views/admin_unit.py:149
 msgid "AdminUnit successfully updated"
 msgstr "Organisation erfolgreich aktualisiert"
 
-#: project/views/admin_unit.py:167
+#: project/views/admin_unit.py:171
 msgid "Organization invitation accepted"
 msgstr "Organisationseinladung akzeptiert"
 
@@ -2191,7 +2199,7 @@ msgstr ""
 "Ob alle zukünftigen Empfehlungsanfragen von %(admin_unit_name)s "
 "automatisch verifiziert werden sollen."
 
-#: project/views/utils.py:76
+#: project/views/utils.py:77
 msgid ""
 "An entry with the entered values ​​already exists. Duplicate entries are "
 "not allowed."
@@ -2199,16 +2207,16 @@ msgstr ""
 "Ein Eintrag mit den eingegebenen Werten existiert bereits. Doppelte "
 "Einträge sind nicht erlaubt."
 
-#: project/views/utils.py:127
+#: project/views/utils.py:128
 #, python-format
 msgid "Error in the %s field - %s"
 msgstr "Fehler im Feld %s: %s"
 
-#: project/views/utils.py:134
+#: project/views/utils.py:135
 msgid "Show"
 msgstr "Anzeigen"
 
-#: project/views/utils.py:141
+#: project/views/utils.py:142
 msgid "You do not have permission for this action"
 msgstr "Du hast keine Berechtigung für diese Aktion"
 
diff --git a/project/translations/en/LC_MESSAGES/messages.mo b/project/translations/en/LC_MESSAGES/messages.mo
index c83b0a5..367745d 100644
Binary files a/project/translations/en/LC_MESSAGES/messages.mo and b/project/translations/en/LC_MESSAGES/messages.mo differ
diff --git a/project/translations/en/LC_MESSAGES/messages.po b/project/translations/en/LC_MESSAGES/messages.po
index dcf6dc1..7099967 100644
--- a/project/translations/en/LC_MESSAGES/messages.po
+++ b/project/translations/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-10-20 23:30+0200\n"
+"POT-Creation-Date: 2021-10-26 23:29+0200\n"
 "PO-Revision-Date: 2021-04-30 15:04+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -1335,7 +1335,7 @@ msgstr ""
 msgid "Manage"
 msgstr ""
 
-#: project/templates/home.html:30 project/templates/security/login_user.html:35
+#: project/templates/home.html:30 project/templates/security/login_user.html:38
 #: project/views/widget.py:158
 msgid "Register for free"
 msgstr ""
@@ -1894,7 +1894,11 @@ msgstr ""
 msgid "This will allow \"%(client_name)s\" to:"
 msgstr ""
 
-#: project/templates/security/login_user.html:33
+#: project/templates/security/login_user.html:27
+msgid "Remember me"
+msgstr ""
+
+#: project/templates/security/login_user.html:36
 msgid "You do not have an account yet? Not a problem!"
 msgstr ""
 
@@ -1922,7 +1926,7 @@ msgstr ""
 msgid "Organization successfully updated"
 msgstr ""
 
-#: project/views/admin.py:68 project/views/manage.py:317
+#: project/views/admin.py:68 project/views/manage.py:318
 msgid "Settings successfully updated"
 msgstr ""
 
@@ -1936,15 +1940,15 @@ msgid ""
 "test phase. If you are interested, you can contact us."
 msgstr ""
 
-#: project/views/admin_unit.py:115
+#: project/views/admin_unit.py:119
 msgid "Organization successfully created"
 msgstr ""
 
-#: project/views/admin_unit.py:145
+#: project/views/admin_unit.py:149
 msgid "AdminUnit successfully updated"
 msgstr ""
 
-#: project/views/admin_unit.py:167
+#: project/views/admin_unit.py:171
 msgid "Organization invitation accepted"
 msgstr ""
 
@@ -2135,22 +2139,22 @@ msgid ""
 "verified automatically."
 msgstr ""
 
-#: project/views/utils.py:76
+#: project/views/utils.py:77
 msgid ""
 "An entry with the entered values ​​already exists. Duplicate entries are "
 "not allowed."
 msgstr ""
 
-#: project/views/utils.py:127
+#: project/views/utils.py:128
 #, python-format
 msgid "Error in the %s field - %s"
 msgstr ""
 
-#: project/views/utils.py:134
+#: project/views/utils.py:135
 msgid "Show"
 msgstr ""
 
-#: project/views/utils.py:141
+#: project/views/utils.py:142
 msgid "You do not have permission for this action"
 msgstr ""