diff --git a/attributes/default.rb b/attributes/default.rb
index 873753d..a7b45af 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -35,6 +35,7 @@
 default['wordpress']['db']['port'] = '3306'  # Must be a string
 default['wordpress']['db']['charset'] = 'utf8'
 default['wordpress']['db']['collate'] = ''
+default['wordpress']['db']['install'] = true
 case node['platform']
 when 'ubuntu'
   case node['platform_version']
@@ -101,3 +102,12 @@
 end
 
 default['wordpress']['php_options'] = { 'php_admin_value[upload_max_filesize]' => '50M', 'php_admin_value[post_max_size]' => '55M' }
+
+default['wordpress']['keys']['auth'] = nil
+default['wordpress']['keys']['secure_auth'] = nil
+default['wordpress']['keys']['logged_in'] = nil
+default['wordpress']['keys']['nonce'] = nil
+default['wordpress']['salt']['auth'] = nil
+default['wordpress']['salt']['secure_auth'] = nil
+default['wordpress']['salt']['logged_in'] = nil
+default['wordpress']['salt']['nonce'] = nil
diff --git a/libraries/helpers.rb b/libraries/helpers.rb
index ce6e3fb..e9d4c58 100644
--- a/libraries/helpers.rb
+++ b/libraries/helpers.rb
@@ -22,7 +22,7 @@
 module Wordpress
   module Helpers
     def is_local_host?(host)
-      if host == 'localhost' || host == '127.0.0.1' || host == '::1'
+      if host == 'localhost' || host == '127.0.0.1' || host == '::1' || host =~ /\Alocalhost:.*\z/
         true
       else
         require 'socket'
diff --git a/recipes/app.rb b/recipes/app.rb
index b3d9f41..1043298 100644
--- a/recipes/app.rb
+++ b/recipes/app.rb
@@ -20,14 +20,14 @@
 include_recipe "wordpress::database"
 
 ::Chef::Recipe.send(:include, Opscode::OpenSSL::Password)
-node.set_unless['wordpress']['keys']['auth'] = secure_password
-node.set_unless['wordpress']['keys']['secure_auth'] = secure_password
-node.set_unless['wordpress']['keys']['logged_in'] = secure_password
-node.set_unless['wordpress']['keys']['nonce'] = secure_password
-node.set_unless['wordpress']['salt']['auth'] = secure_password
-node.set_unless['wordpress']['salt']['secure_auth'] = secure_password
-node.set_unless['wordpress']['salt']['logged_in'] = secure_password
-node.set_unless['wordpress']['salt']['nonce'] = secure_password
+node.normal['wordpress']['keys']['auth'] = secure_password unless node['wordpress']['keys']['auth']
+node.normal['wordpress']['keys']['secure_auth'] = secure_password unless node['wordpress']['keys']['secure_auth']
+node.normal['wordpress']['keys']['logged_in'] = secure_password unless node['wordpress']['keys']['logged_in']
+node.normal['wordpress']['keys']['nonce'] = secure_password unless node['wordpress']['keys']['nonce']
+node.normal['wordpress']['salt']['auth'] = secure_password unless node['wordpress']['salt']['auth']
+node.normal['wordpress']['salt']['secure_auth'] = secure_password unless node['wordpress']['salt']['secure_auth']
+node.normal['wordpress']['salt']['logged_in'] = secure_password unless node['wordpress']['salt']['logged_in']
+node.normal['wordpress']['salt']['nonce'] = secure_password unless node['wordpress']['salt']['nonce']
 node.save unless Chef::Config[:solo]
 
 directory node['wordpress']['dir'] do
diff --git a/recipes/database.rb b/recipes/database.rb
index 3f61d78..131296a 100644
--- a/recipes/database.rb
+++ b/recipes/database.rb
@@ -32,12 +32,12 @@
 ::Chef::Recipe.send(:include, Opscode::OpenSSL::Password)
 ::Chef::Recipe.send(:include, Wordpress::Helpers)
 
-node.set_unless['wordpress']['db']['pass'] = secure_password
+node.normal['wordpress']['db']['pass'] = secure_password unless node['wordpress']['db']['pass']
 node.save unless Chef::Config[:solo]
 
 db = node['wordpress']['db']
 
-if is_local_host? db['host']
+if is_local_host? db['host'] and db['install']
 
   # The following is required for the mysql community cookbook to work properly
   include_recipe 'selinux::disabled' if node['platform_family'] == 'rhel'
diff --git a/recipes/nginx.rb b/recipes/nginx.rb
index 7820a2b..e66b359 100644
--- a/recipes/nginx.rb
+++ b/recipes/nginx.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-node.set_unless['php-fpm']['pools'] = []
+node.normal['php-fpm']['pools'] = [] unless node['php-fpm']['pools']
 
 include_recipe "php-fpm"
 
@@ -36,7 +36,7 @@
 
 include_recipe "php::module_mysql"
 
-node.set_unless['nginx']['default_site_enabled'] = false
+node.normal['nginx']['default_site_enabled'] = false unless node['nginx']['default_site_enabled']
 include_recipe "nginx"
 
 include_recipe "wordpress::app"