diff --git a/files/helpers/const.py b/files/helpers/const.py
index 45d07ec04..202f72989 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -824,7 +824,7 @@ emoji_regex3 = re.compile(f"(?([\w:~,()\-.#&\/=?@%;+]{5,250})<\/a>', flags=re.A)
-email_regex = re.compile('([A-Za-z0-9]+[.-_])*[A-Za-z0-9]+@[A-Za-z0-9-]+(\.[A-Z|a-z]{2,100})+', flags=re.A)
+email_regex = re.compile('[^@]+@[^@]+\.[^@]+', flags=re.A)
utm_regex = re.compile('utm_[a-z]+=[a-z0-9_]+&', flags=re.A)
utm_regex2 = re.compile('[?&]utm_[a-z]+=[a-z0-9_]+', flags=re.A)
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 061ae2c9d..1e0a9aaea 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -845,8 +845,8 @@
{% endif %}
{% if v %}
-
-
+
+
{% endif %}
diff --git a/files/templates/submit.html b/files/templates/submit.html
index db045a2ae..cf77a6b9c 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -224,7 +224,7 @@
{% endif %}
-
+
{% include "emoji_modal.html" %}
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 735261836..cb39d5339 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -769,7 +769,7 @@
{% endif %}
-
+
{% if v and v.id != u.id and '/comments' not in request.path %}