diff --git a/src/scripts/backupbox.sh b/src/scripts/backupbox.sh
index 06e83027d..6e4def7d9 100755
--- a/src/scripts/backupbox.sh
+++ b/src/scripts/backupbox.sh
@@ -34,7 +34,7 @@ if [[ "$1" == "s3" ]]; then
     readonly endpoint_url="$6"
     readonly password="$7"
 
-    if [ $# -gt 6 ]; then
+    if [ $# -gt 7 ]; then
         export AWS_SESSION_TOKEN="$8"
     fi
 fi
diff --git a/src/storage/s3.js b/src/storage/s3.js
index df7837d17..ada7d9b90 100644
--- a/src/storage/s3.js
+++ b/src/storage/s3.js
@@ -29,12 +29,13 @@ function getBackupCredentials(apiConfig, callback) {
 
     var credentials = {
         signatureVersion: 'v4',
+        s3ForcePathStyle: true,
         accessKeyId: apiConfig.accessKeyId,
         secretAccessKey: apiConfig.secretAccessKey,
         region: apiConfig.region || 'us-east-1'
     };
 
-    if (apiConfig.endpoint) credentials.endpoint = new AWS.Endpoint(apiConfig.endpoint);
+    if (apiConfig.endpoint) credentials.endpoint = apiConfig.endpoint;
 
     callback(null, credentials);
 }