diff --git a/apps/scripts b/apps/scripts
index f0aa426950b9b867bf99233795e260871be2cb99..c37a6effc9217e2ffceb631f48b371f87814c1f6 160000
--- a/apps/scripts
+++ b/apps/scripts
@@ -1 +1 @@
-Subproject commit f0aa426950b9b867bf99233795e260871be2cb99
+Subproject commit c37a6effc9217e2ffceb631f48b371f87814c1f6
diff --git a/note_kfet/settings/development.py b/note_kfet/settings/development.py
index 0a0c21e1b4c4b12008593aa1ac75616c3517c940..cc94ffd6ed6f416a8bac73a190a0984a4506e683 100644
--- a/note_kfet/settings/development.py
+++ b/note_kfet/settings/development.py
@@ -44,14 +44,8 @@ ALLOWED_HOSTS = ['*']
 
 # Emails
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-# EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-# EMAIL_USE_SSL = False
-# EMAIL_HOST = 'smtp.example.org'
-# EMAIL_PORT = 25
-# EMAIL_HOST_USER = 'change_me'
-# EMAIL_HOST_PASSWORD = 'change_me'
 
-SERVER_EMAIL = 'no-reply@' + os.getenv("DOMAIN", "example.com")
+SERVER_EMAIL = 'notekfet@localhost'
 
 # Security settings
 SECURE_CONTENT_TYPE_NOSNIFF = False
diff --git a/note_kfet/settings/production.py b/note_kfet/settings/production.py
index 7b8d37ef5d6b4f6fdebf5d768fea49964549a494..f5e133b171a96661e40407b079bdf56858ce061f 100644
--- a/note_kfet/settings/production.py
+++ b/note_kfet/settings/production.py
@@ -33,15 +33,14 @@ ALLOWED_HOSTS = [os.environ.get('NOTE_URL', 'localhost')]
 SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY', 'CHANGE_ME_IN_ENV_SETTINGS')
 
 # Emails
-EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-# EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-# EMAIL_USE_SSL = False
-# EMAIL_HOST = 'smtp.example.org'
-# EMAIL_PORT = 25
-# EMAIL_HOST_USER = 'change_me'
-# EMAIL_HOST_PASSWORD = 'change_me'
-
-SERVER_EMAIL = 'no-reply@' + os.getenv("DOMAIN", "example.com")
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+EMAIL_USE_SSL = False
+EMAIL_HOST = os.getenv('EMAIL_HOST', 'smtp.example.org')
+EMAIL_PORT = os.getenv('EMAIL_PORT', 443)
+EMAIL_HOST_USER = os.getenv('EMAIL_USER', 'change_me')
+EMAIL_HOST_PASSWORD = os.getenv('EMAIL_PASSWORD', 'change_me')
+
+SERVER_EMAIL = os.getenv("NOTE_MAIL", "notekfet@example.com")
 
 # Security settings
 SECURE_CONTENT_TYPE_NOSNIFF = False
diff --git a/note_kfet/settings/secrets_example.py b/note_kfet/settings/secrets_example.py
index 70d17ad4330565837b440b177722e336cc0b6c58..5f4b8ff5a7a32ac3a513367db928094a161a2089 100644
--- a/note_kfet/settings/secrets_example.py
+++ b/note_kfet/settings/secrets_example.py
@@ -4,6 +4,7 @@
 # CAS
 OPTIONAL_APPS = [
 #    'cas_server',
-#    'cas',
 #    'debug_toolbar'
 ]
+
+ADMINS = [('Note Kfet', 'notekfet@example.com')]