Yes it should, but we thought that should be a separate story - there 
are a few places where we need to make email addresses configurable.