diff --git a/forms.py b/forms.py
index 60738f3..7fe2c34 100644
--- a/forms.py
+++ b/forms.py
@@ -15,10 +15,13 @@ def email_comment(self, user, noun, file_names):
         message_body = '%s\n\n%s' % (cd['message'], '\n'.join(file_names))
         send_mail(
             'Comment from %s %s about %s' % (
-                user.first_name, user.last_name, noun),
+                user.first_name,
+                user.last_name,
+                noun
+            ),
             message_body,
-            user.email or 'noreply@gedgo.com',
-            [email for _, email in settings.ADMINS]
+            'noreply@gedgo.com',
+            settings.SERVER_EMAIL
         )
 
 
diff --git a/gedcom_parser.py b/gedcom_parser.py
index a58de5c..2e4506d 100644
--- a/gedcom_parser.py
+++ b/gedcom_parser.py
@@ -12,7 +12,7 @@ class GedcomParser(object):
     line_re = re.compile(
         '^(\d{1,2})' +          # Level
         '(?: @([A-Z\d]+)@)?' +  # Pointer, optional
-        ' _?([A-Z\d]{3,})' +   # Tag
+        ' _?([A-Z\d]{3,})' +    # Tag
         '(?: (.+))?$'           # Value, optional
     )