diff --git a/pedasi/settings.py b/pedasi/settings.py
index 44f089e5dd32b9fb4ce2189b60529a13bed8b968..3d419d1527d95aa858405ebe7e7b385c3b40a061 100644
--- a/pedasi/settings.py
+++ b/pedasi/settings.py
@@ -321,10 +321,15 @@ EMAIL_PORT = config('EMAIL_PORT', cast=int, default=25)
 
 EMAIL_HOST_USER = config('EMAIL_HOST_USER', default=None)
 EMAIL_HOST_PASSWORD = config('EMAIL_HOST_PASSWORD', default=None)
+DEFAULT_FROM_EMAIL = config('DEFAULT_FROM_EMAIL', default=EMAIL_HOST_USER)
 
 EMAIL_USE_TLS = config('EMAIL_USE_TLS', cast=bool, default=False)
 EMAIL_USE_SSL = config('EMAIL_USE_SSL', cast=bool, default=False)
 
+EMAIL_SUBJECT_PREFIX = '[PEDASI]'
+
 if DEBUG and not EMAIL_HOST:
     EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
-    EMAIL_FILE_PATH = os.path.join(BASE_DIR, 'mail.log')
+    EMAIL_FILE_PATH = os.path.join(BASE_DIR, 'mail')
+
+ADMINS = [val.split('|') for val in config('ADMINS', cast=Csv(), default='')]
diff --git a/profiles/social_auth.py b/profiles/social_auth.py
index 1d2414085ced58ee34bf35d7ff49513edf197b73..bde0c5e286ea346d6552e128212e1dd8a4bf02b7 100644
--- a/profiles/social_auth.py
+++ b/profiles/social_auth.py
@@ -34,5 +34,5 @@ def email_admins(strategy, details, backend, user=None, *args, **kwargs):
     if kwargs['is_new']:
         mail_admins(
             subject='PEDASI Account Created',
-            message='User account created'
+            message='Account created: {0}'.format(user.username)
         )