diff --git a/app/templates/users/change_set_password.html b/app/templates/users/change_set_password.html
index 26c647a0..1766e325 100644
--- a/app/templates/users/change_set_password.html
+++ b/app/templates/users/change_set_password.html
@@ -15,6 +15,9 @@ <h1>{{ _("Set Password") }}</h1>
 		{{ render_field(form.email, tabindex=220,
 				hint=_("Your email is needed to recover your account if you forget your password and to send (configurable) notifications. ") +
 					_("Your email will never be shared with a third-party.")) }}
+		<p>
+			{{ _("Note: protonmail is unsupported by ContentDB. <a href='https://forum.minetest.net/viewtopic.php?t=30709'>More info</a>.") }}
+		</p>
 	{% endif %}
 
 	{% if form.old_password %}
diff --git a/app/templates/users/register.html b/app/templates/users/register.html
index b7b1553e..a87d8d35 100644
--- a/app/templates/users/register.html
+++ b/app/templates/users/register.html
@@ -23,6 +23,9 @@ <h2 class="card-header">{{ self.title() }}</h2>
 		{{ render_field(form.email,
 				hint=_("Your email is needed to recover your account if you forget your password and to send (configurable) notifications. ") +
 					_("Your email will never be shared with a third-party.")) }}
+		<p>
+			{{ _("Note: protonmail is unsupported by ContentDB. <a href='https://forum.minetest.net/viewtopic.php?t=30709'>More info</a>.") }}
+		</p>
 
 		{{ render_field(form.password, hint=_("Must be at least 12 characters long.")) }}
 
diff --git a/app/templates/users/settings_email.html b/app/templates/users/settings_email.html
index 69c708bc..9f3ac59a 100644
--- a/app/templates/users/settings_email.html
+++ b/app/templates/users/settings_email.html
@@ -23,6 +23,9 @@ <h3>{{ _("Email Address") }}</h3>
 			{{  _("Your email is needed to recover your account if you forget your password, and to send (configurable) notifications.") }}
 			{{  _("Your email will never be shared with a third-party.") }}
 		</p>
+		<p>
+			{{ _("Note: protonmail is unsupported by ContentDB. <a href='https://forum.minetest.net/viewtopic.php?t=30709'>More info</a>.") }}
+		</p>
 
 		{% if user.email_verifications.filter_by(is_password_reset=False).count() > 0 %}
 			<p>