diff --git a/auth b/auth
index 2e91327f2deecbaa351cd1f4ad66ea7d4dc08d37..1b4293e0b1476dab0214c2da1075aba0fd836bc2 160000
--- a/auth
+++ b/auth
@@ -1 +1 @@
-Subproject commit 2e91327f2deecbaa351cd1f4ad66ea7d4dc08d37
+Subproject commit 1b4293e0b1476dab0214c2da1075aba0fd836bc2
diff --git a/email_debug.py b/email_debug.py
new file mode 100644
index 0000000000000000000000000000000000000000..3cdf57a8b4c469866c39b4d5a71816b865e98769
--- /dev/null
+++ b/email_debug.py
@@ -0,0 +1,4 @@
+import smtpd
+import asyncore
+server = smtpd.DebuggingServer(('127.0.0.1', 1025), None)
+asyncore.loop()
diff --git a/helios b/helios
index 45d16129284cea04bfb90358f8a73ef8c2c82e30..8653d35324dcd97ffec612f99854b3ce82ff7551 160000
--- a/helios
+++ b/helios
@@ -1 +1 @@
-Subproject commit 45d16129284cea04bfb90358f8a73ef8c2c82e30
+Subproject commit 8653d35324dcd97ffec612f99854b3ce82ff7551
diff --git a/settings.py.sample b/settings.py.sample
index 20c12a001e8f6d74791109261ead1fa9db12669b..357624c221790165579e5d4633079848dd902ac0 100644
--- a/settings.py.sample
+++ b/settings.py.sample
@@ -125,6 +125,12 @@ HELIOS_VOTERS_EMAIL = True
 AUTH_ENABLED_AUTH_SYSTEMS = ['password','facebook','twitter']
 AUTH_DEFAULT_AUTH_SYSTEM = None
 
+# email server
+EMAIL_HOST = 'localhost'
+EMAIL_PORT = 1025
+EMAIL_HOST_USER = ''
+EMAIL_HOST_PASSWORD = ''
+EMAIL_USE_TLS = False
 
 # set up logging
 import logging