diff --git a/includes/destinations.s3.inc b/includes/destinations.s3.inc
index c049806..35b8b6e 100644
--- a/includes/destinations.s3.inc
+++ b/includes/destinations.s3.inc
@@ -84,8 +84,7 @@ function edit_form() {
     $form = parent::edit_form();
     $form['scheme']['#type'] = 'value';
     $form['scheme']['#value'] = 'https';
-    $form['host']['#type'] = 'value';
-    $form['host']['#value'] = 's3.amazonaws.com';
+    $form['host']['#default_value'] = @$this->dest_url['host'] ? $this->dest_url['host'] : 's3.amazonaws.com';
 
     $form['path']['#title'] = 'S3 Bucket';
     $form['path']['#default_value'] = $this->get_bucket();
@@ -173,7 +172,7 @@ function s3_object() {
       if (file_exists($path . '/S3.php')) {
         require_once $path . '/S3.php';
         if (!$this->s3 && !empty($this->dest_url['user'])) {
-          $this->s3 = new S3($this->dest_url['user'], $this->dest_url['pass']);
+          $this->s3 = new S3($this->dest_url['user'], $this->dest_url['pass'], FALSE, $this->dest_url['host']);
         }
         return $this->s3;
       }