diff --git a/CHANGELOG.md b/CHANGELOG.md
index aaa9ecac..4639c399 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ upgrading Freposte.io as some changes will include useful notes.
 
 v1.6.1 - unreleased
 -------------------
+- Enhancement: Distinguish disabled user in user list view by row color
 - Enhancement: Make Unbound drop privileges after binding to port
 - Enhancement: Create an Authentication Token with IPv6 address restriction ([#829](https://github.com/Mailu/Mailu/issues/829))
 - Enhancement: Missing wildcard option in alias flask command ([#869](https://github.com/Mailu/Mailu/issues/869))
diff --git a/core/admin/mailu/ui/templates/user/list.html b/core/admin/mailu/ui/templates/user/list.html
index 8a8fad69..2aff662f 100644
--- a/core/admin/mailu/ui/templates/user/list.html
+++ b/core/admin/mailu/ui/templates/user/list.html
@@ -25,7 +25,7 @@
   <th>{% trans %}Last edit{% endtrans %}</th>
 </tr>
 {% for user in domain.users %}
-<tr>
+<tr {% if not user.enabled %}class="warning"{% endif %}>
   <td>
     <a href="{{ url_for('.user_edit', user_email=user.email) }}" title="{% trans %}Edit{% endtrans %}"><i class="fa fa-pencil"></i></a>&nbsp;
     <a href="{{ url_for('.user_delete', user_email=user.email) }}" title="{% trans %}Delete{% endtrans %}"><i class="fa fa-trash"></i></a>