diff --git a/README.md b/README.md
index 616f756..a999636 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,10 @@ To install StoryBoard and configure it with sane defaults, include the
 following in your site.pp file:
 
     node default {
-        include storyboard
+        class { 'storyboard':
+            mysql_user_password    => 'changeme',
+            rabbitmq_user_password => 'changemetoo'
+        }
     }
 
 # Configuration
@@ -202,4 +205,4 @@ File content format:
     - openid: https://login.launchpad.net/+id/some_openid
       email: your_email@some_email_host.com
     - openid: https://login.launchpad.net/+id/some_other_id
-      email: admin_email@some_email_host.com
\ No newline at end of file
+      email: admin_email@some_email_host.com
diff --git a/manifests/application.pp b/manifests/application.pp
index acf69c9..90ac905 100644
--- a/manifests/application.pp
+++ b/manifests/application.pp
@@ -36,13 +36,13 @@ class storyboard::application (
   $mysql_port             = 3306,
   $mysql_database         = 'storyboard',
   $mysql_user             = 'storyboard',
-  $mysql_user_password    = 'changeme',
+  $mysql_user_password,
 
   $rabbitmq_host          = 'localhost',
   $rabbitmq_port          = 5672,
   $rabbitmq_vhost         = '/',
   $rabbitmq_user          = 'storyboard',
-  $rabbitmq_user_password = 'changemetoo',
+  $rabbitmq_user_password,
   $enable_notifications   = 'True'
 ) {
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 80b92df..7c6ca1f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -22,10 +22,10 @@
 class storyboard (
   $mysql_database      = 'storyboard',
   $mysql_user          = 'storyboard',
-  $mysql_user_password = 'changeme',
+  $mysql_user_password,
 
   $rabbitmq_user            = 'storyboard',
-  $rabbitmq_user_password   = 'changemetoo',
+  $rabbitmq_user_password,
 
   $hostname            = $::fqdn,
   $openid_url          = 'https://login.launchpad.net/+openid',
diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index 0196a6a..0443648 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -20,7 +20,7 @@
 class storyboard::mysql (
   $mysql_database      = 'storyboard',
   $mysql_user          = 'storyboard',
-  $mysql_user_password = 'changeme',
+  $mysql_user_password,
 ) {
 
   # Install MySQL
diff --git a/manifests/rabbit.pp b/manifests/rabbit.pp
index f0acc1c..b4f0d7a 100644
--- a/manifests/rabbit.pp
+++ b/manifests/rabbit.pp
@@ -20,7 +20,7 @@
 #
 class storyboard::rabbit (
   $rabbitmq_user          = 'storyboard',
-  $rabbitmq_user_password = 'changeme'
+  $rabbitmq_user_password
 ) {
 
   class { 'rabbitmq':