diff --git a/aleksis/core/templates/material/field_errors.html b/aleksis/core/templates/material/field_errors.html
new file mode 100644
index 0000000000000000000000000000000000000000..3100407ef6ec7bc0dcad9d37323bf102c2462aa4
--- /dev/null
+++ b/aleksis/core/templates/material/field_errors.html
@@ -0,0 +1,5 @@
+{% if bound_field.errors %}
+  <div class="errors">
+    {% for error in bound_field.errors %}<small class="error-text">{{ error }}</small>{% endfor %}
+  </div>
+{% endif %}
diff --git a/aleksis/core/templates/material/non_field_errors.html b/aleksis/core/templates/material/non_field_errors.html
new file mode 100644
index 0000000000000000000000000000000000000000..c8a92eb7ef813325580738a7819fccf6da2dfa70
--- /dev/null
+++ b/aleksis/core/templates/material/non_field_errors.html
@@ -0,0 +1,7 @@
+{% if form.non_field_errors %}
+  <div class="alert error">
+    {% for error in form.non_field_errors %}
+      <div><i class="material-icons left">error</i> {{ error }}</div>
+    {% endfor %}
+  </div>
+{% endif %}
diff --git a/poetry.lock b/poetry.lock
index 92e5c2e738113542002e6e31a17c5a1be7ad08c0..d9be8bb5af93ba37e7587f9002540884c57f4a5e 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -544,6 +544,10 @@ version = "1.6.0"
 [package.dependencies]
 six = "*"
 
+[package.source]
+reference = "8d9d49e7d7c000e1e637ef9b7f1d9eb289c509c9"
+type = "git"
+url = "https://github.com/viewflow/django-material.git"
 [[package]]
 category = "main"
 description = "A straightforward menu generator for Django"
@@ -2191,10 +2195,7 @@ django-maintenance-mode = [
     {file = "django-maintenance-mode-0.14.0.tar.gz", hash = "sha256:f3fef1760fdcda5e0bf6c2966aadc77eea6f328580a9c751920daba927281a68"},
     {file = "django_maintenance_mode-0.14.0-py2-none-any.whl", hash = "sha256:b4cc24a469ed10897826a28f05d64e6166a58d130e4940ac124ce198cd4cc778"},
 ]
-django-material = [
-    {file = "django-material-1.6.0.tar.gz", hash = "sha256:767ab6ad51f906bf773f927e853c2bff6b4ebdd1bd2bf45dbd4ef3e31657c3d5"},
-    {file = "django_material-1.6.0-py2.py3-none-any.whl", hash = "sha256:6a30e42f0ceefef1ff325bda0017fa6f6a7fa534b15b8fcc48eb96de4b6adc8e"},
-]
+django-material = []
 django-menu-generator = [
     {file = "django-menu-generator-1.0.4.tar.gz", hash = "sha256:ce71a5055c16933c8aff64fb36c21e5cf8b6d505733aceed1252f8b99369a378"},
 ]
diff --git a/pyproject.toml b/pyproject.toml
index 42ae4b0b3490adc35a492f20950d0de8eeaf5afc..8d606b30b40a5cfdb6d0b3ad94fd1f5a70d8bd13 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -49,7 +49,7 @@ django_select2 = "^7.1"
 requests = "^2.22"
 django-two-factor-auth = { version = "^1.10.0", extras = [ "YubiKey", "phonenumbers", "Call", "SMS" ] }
 django-yarnpkg = "^6.0"
-django-material = "^1.6.0"
+django-material = {git = "https://github.com/viewflow/django-material.git", rev = "8d9d49e7d7c000e1e637ef9b7f1d9eb289c509c9"}
 django-pwa = {git = "https://github.com/Natureshadow/django-pwa", rev = "67cf917a081df3116968f684ebb28e4c076b2b50" }
 django-constance = { version = "^2.6.0", extras = ["database"] }
 django_widget_tweaks = "^1.4.5"