diff --git a/smash/smash/local_settings.py.template b/smash/smash/local_settings.py.template
index b5c398c064b0b58992f6adf380bdb94b6ebc15a9..ba1dcda662d69f97380d284555e5284a86898335 100644
--- a/smash/smash/local_settings.py.template
+++ b/smash/smash/local_settings.py.template
@@ -6,6 +6,14 @@ DEBUG = True
 
 WSGI_APPLICATION = 'smash.wsgi.application'
 
+EMAIL_USE_TLS = False
+EMAIL_USE_SSL = False
+EMAIL_HOST = 'smtp.uni.lu'
+EMAIL_HOST_USER = ''
+EMAIL_HOST_PASSWORD = ''
+EMAIL_PORT = 25
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+DEFAULT_FROM_EMAIL = 'prc-scheduling-admin@uni.lu'
 
 # Database
 # https://docs.djangoproject.com/en/1.10/ref/settings/#databases
diff --git a/smash/smash/settings.py b/smash/smash/settings.py
index 9b80aea3969b577d7140c7ba823e080b9c2a1da6..fd634ff83188a8b9950da2f5b35871f8e9eaaf68 100644
--- a/smash/smash/settings.py
+++ b/smash/smash/settings.py
@@ -22,15 +22,6 @@ ALLOWED_HOSTS = ['prc.parkinson.lu', 'localhost']
 
 DEBUG = True
 
-EMAIL_USE_TLS = False
-EMAIL_USE_SSL = False
-EMAIL_HOST = 'smtp-3.uni.lu'
-EMAIL_HOST_USER = 'piotr.gawron@uni.lu'
-EMAIL_HOST_PASSWORD = '123qweasdzxc'
-EMAIL_PORT = 25
-EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-DEFAULT_FROM_EMAIL = 'piotr.gawron@uni.lu'
-
 # Application definition
 
 INSTALLED_APPS = [
diff --git a/smash/web/migrations/0032_configurationitem_email_items.py b/smash/web/migrations/0032_configurationitem_email_items.py
index 2c44e7953d27f0a4e7785b0ff7924857bb3afa18..1e2142aa414c08d1a33589fd2044a13238b391e2 100644
--- a/smash/web/migrations/0032_configurationitem_email_items.py
+++ b/smash/web/migrations/0032_configurationitem_email_items.py
@@ -4,13 +4,9 @@ from __future__ import unicode_literals
 
 from django.db import migrations
 
-from web.models.constants import EMAIL_HOST_CONFIGURATION_TYPE, \
-    EMAIL_PORT_CONFIGURATION_TYPE, \
-    EMAIL_USER_CONFIGURATION_TYPE, \
-    EMAIL_PASSWORD_CONFIGURATION_TYPE, \
-    EMAIL_CONFIGURATION_TYPE, \
-    KIT_RECIPIENT_EMAIL_CONFIGURATION_TYPE, \
-    KIT_DAILY_EMAIL_HOUR_CONFIGURATION_TYPE
+from web.models.constants import KIT_RECIPIENT_EMAIL_CONFIGURATION_TYPE, \
+    KIT_EMAIL_HOUR_CONFIGURATION_TYPE, \
+    KIT_EMAIL_DAY_OF_WEEK_CONFIGURATION_TYPE
 
 
 def create_item(apps, type, value, name):
@@ -25,15 +21,12 @@ def create_item(apps, type, value, name):
 
 
 def configuration_items(apps, schema_editor):
-    create_item(apps, EMAIL_HOST_CONFIGURATION_TYPE, "smtp.example.com", "SMTP host")
-    create_item(apps, EMAIL_PORT_CONFIGURATION_TYPE, "25", "SMTP port")
-    create_item(apps, EMAIL_USER_CONFIGURATION_TYPE, "your_login", "SMTP username")
-    create_item(apps, EMAIL_PASSWORD_CONFIGURATION_TYPE, "your_password", "SMTP password")
-    create_item(apps, EMAIL_CONFIGURATION_TYPE, "sent.from@email.lu", "System email address")
     create_item(apps, KIT_RECIPIENT_EMAIL_CONFIGURATION_TYPE, "kit.receipents@lu;with.semicolon@separation.lu",
                 "Recipients of kit requests email")
-    create_item(apps, KIT_DAILY_EMAIL_HOUR_CONFIGURATION_TYPE, "17:00",
+    create_item(apps, KIT_EMAIL_HOUR_CONFIGURATION_TYPE, "17:00",
                 "At what time kit request emails should be sent")
+    create_item(apps, KIT_EMAIL_DAY_OF_WEEK_CONFIGURATION_TYPE, "FRIDAY",
+                "At what weekday kit request emails should be sent")
 
 
 class Migration(migrations.Migration):
diff --git a/smash/web/models/constants.py b/smash/web/models/constants.py
index 307b312fdf148397958fd3f377a783bb70aae897..5d7ac193bc9e18e59b15e858bafb2a92ee8e15aa 100644
--- a/smash/web/models/constants.py
+++ b/smash/web/models/constants.py
@@ -31,10 +31,6 @@ CONTACT_TYPES_CHOICES = (
 CANCELLED_APPOINTMENT_COLOR_CONFIGURATION_TYPE = "CANCELLED_APPOINTMENT_COLOR"
 NO_SHOW_APPOINTMENT_COLOR_CONFIGURATION_TYPE = "NO_SHOW_APPOINTMENT_COLOR"
 
-EMAIL_HOST_CONFIGURATION_TYPE = "EMAIL_HOST_CONFIGURATION_TYPE"
-EMAIL_PORT_CONFIGURATION_TYPE = "EMAIL_PORT_CONFIGURATION_TYPE"
-EMAIL_USER_CONFIGURATION_TYPE = "EMAIL_USER_CONFIGURATION_TYPE"
-EMAIL_PASSWORD_CONFIGURATION_TYPE = "EMAIL_PASSWORD_CONFIGURATION_TYPE"
-EMAIL_CONFIGURATION_TYPE = "EMAIL_CONFIGURATION_TYPE"
 KIT_RECIPIENT_EMAIL_CONFIGURATION_TYPE = "KIT_RECIPIENT_EMAIL_CONFIGURATION_TYPE"
-KIT_DAILY_EMAIL_HOUR_CONFIGURATION_TYPE = "KIT_DAILY_EMAIL_HOUR_CONFIGURATION_TYPE"
+KIT_EMAIL_HOUR_CONFIGURATION_TYPE = "KIT_DAILY_EMAIL_HOUR_CONFIGURATION_TYPE"
+KIT_EMAIL_DAY_OF_WEEK_CONFIGURATION_TYPE = "KIT_EMAIL_DAY_OF_WEEK_CONFIGURATION_TYPE"