diff --git a/.gitignore b/.gitignore
index 99b980705742a67dfce3a948cf16006d4fa3e628..19357e968f9a880c9c582f176d91697186b1d749 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ static/rest_framework/
 static/debug_toolbar/
 doc/build/*
 doc/build/.buildinfo
+settings/settings_secret.py
diff --git a/settings/default.py b/settings/default.py
index 682e82a438027d3f7a1b87f802f853870312f446..2bff96c7cbf48c79a9e4d361ee03d15195c4437b 100644
--- a/settings/default.py
+++ b/settings/default.py
@@ -1,3 +1,4 @@
+from settings_secret import *
 
 # Suitable for production
 ALLOWED_HOSTS = ['*']
@@ -114,7 +115,7 @@ DATABASES = {
         'NAME'     : 'gracedb',
         'ENGINE'   : 'django.db.backends.mysql',
         'USER'     : 'gracedb',
-        'PASSWORD' : 'thinglet',
+        'PASSWORD' : DEFAULT_DB_PASSWORD,
         'OPTIONS'  : {
                          'init_command': 'SET storage_engine=MyISAM',
                      },
@@ -238,7 +239,7 @@ USE_I18N = False
 ADMIN_MEDIA_PREFIX = '/media/'
 
 # Make this unique, and don't share it with anybody.
-SECRET_KEY = '$$&hl%^_4&s0k7sbdr8ll_^gkz-j8oab0tz$t^^b-%$!83d(av'
+SECRET_KEY = DEFAULT_SECRET_KEY
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
diff --git a/settings/test.py b/settings/test.py
index 2912d30d4d02d6c99859fb0569365bf1b2cc0f66..ce099efc7847137ac524a600a0fd1118f4117000 100644
--- a/settings/test.py
+++ b/settings/test.py
@@ -1,3 +1,5 @@
+from settings_secret import *
+
 CONFIG_NAME = "Test"
 
 DEBUG = True
@@ -9,7 +11,7 @@ DATABASES = {
         'NAME'     : 'gracedb',
         'ENGINE'   : 'django.db.backends.mysql',
         'USER'     : 'gracedb',
-        'PASSWORD' : 'thinglet',
+        'PASSWORD' : TEST_DB_PASSWORD,
         'OPTIONS'  : {
             'init_command' : 'SET storage_engine=MYISAM',
         },