token=generate_random_token())
                        token.save()
 
-                       send_template_mail(settings.NOTIFICATION_FROM,
+                       send_template_mail(settings.NOREPLY_FROM,
                                                           form.cleaned_data['email'],
                                                           'Your postgresql.org community account',
                                                           'account/email_change_email.txt',
                        log.info("Generated token {0} for user {1} from {2}".format(token, form.cleaned_data['username'], get_client_ip(request)))
 
                        # Generate an outgoing email
-                       send_template_mail(settings.NOTIFICATION_FROM,
+                       send_template_mail(settings.NOREPLY_FROM,
                                                           form.cleaned_data['email'],
                                                           'Your new postgresql.org community account',
                                                           'account/new_account_email.txt',
 
 STATIC_CHECKOUT="/usr/local/pgweb-static"              # Location of a checked out pgweb-static project
 NOTIFICATION_EMAIL="someone@example.com"               # Address to send notifications *to*
 NOTIFICATION_FROM="someone@example.com"                # Address to send notifications *from*
+NOREPLY_FROM="someone@example.com"                     # Address to send unverified messages from
 LISTSERVER_EMAIL="someone@example.com"                 # Address to majordomo
 BUGREPORT_EMAIL="someone@example.com"                  # Address to pgsql-bugs list
 DOCSREPORT_EMAIL="someone@example.com"                 # Address to pgsql-docs list