diff --git a/modules/hosting/site/hosting_site.drush.inc b/modules/hosting/site/hosting_site.drush.inc
index 7d7b031..52b3007 100644
--- a/modules/hosting/site/hosting_site.drush.inc
+++ b/modules/hosting/site/hosting_site.drush.inc
@@ -195,7 +195,7 @@ function hosting_site_post_hosting_verify_task($task, $data) {
     $task->ref->no_verify = TRUE;
     if ($data['context']['cron_key']) {
       $task->ref->cron_key = $data['context']['cron_key'];
-    $task->ref->db_name = $data['self']['db_name'];
+      $task->ref->db_name = $data['self']['db_name'];
     }
     node_save($task->ref);
 
diff --git a/modules/hosting/site/hosting_site.install b/modules/hosting/site/hosting_site.install
index 9abb2ff..1fa005a 100644
--- a/modules/hosting/site/hosting_site.install
+++ b/modules/hosting/site/hosting_site.install
@@ -32,7 +32,7 @@ function hosting_site_schema() {
       ),
       'db_name' => array(
         'type' => 'varchar',
-        'length' => 16,
+        'length' => 64,
         'not null' => TRUE,
         'default' => '',
       ),
@@ -326,6 +326,8 @@ function hosting_site_update_6201() {
  */
 function hosting_site_update_6202() {
   $ret = array();
-  db_add_field($ret, 'hosting_site', 'db_name', array('type' => 'varchar', 'length' => 16, 'not null' => TRUE, 'default' => ''));
+  db_add_field($ret, 'hosting_site', 'db_name',
+      array('type' => 'varchar', 'length' => 64, 'not null' => TRUE, 'default' => ''));
+
   return $ret;
 }
diff --git a/modules/hosting/site/hosting_site.nodeapi.inc b/modules/hosting/site/hosting_site.nodeapi.inc
index 65521e8..2f5180d 100644
--- a/modules/hosting/site/hosting_site.nodeapi.inc
+++ b/modules/hosting/site/hosting_site.nodeapi.inc
@@ -88,7 +88,7 @@ function hosting_site_view(&$node, $teaser = false) {
     $node->content['info']['db_name'] = array(
       '#type' => 'item',
       '#title' => t('Database name'),
-      '#value' => $node->db_name,
+      '#value' => check_plain($node->db_name),
     );
   }