diff --git a/app/src/main/java/asgardius/page/s3manager/AccountAdd.java b/app/src/main/java/asgardius/page/s3manager/AccountAdd.java
index 24a195d..f965fb4 100644
--- a/app/src/main/java/asgardius/page/s3manager/AccountAdd.java
+++ b/app/src/main/java/asgardius/page/s3manager/AccountAdd.java
@@ -42,8 +42,6 @@ public class AccountAdd extends AppCompatActivity {
         Button accounttest = (Button)findViewById(R.id.testaccount);
         edit = getIntent().getBooleanExtra("edit", false);
         Region region = Region.getRegion(US_EAST_1);
-        S3ClientOptions s3ClientOptions = S3ClientOptions.builder().build();
-        s3ClientOptions.setPathStyleAccess(true);
         if (edit) {
             register.setText(getResources().getString(R.string.accountsave_button));
             id = getIntent().getStringExtra("alias");
@@ -115,6 +113,10 @@ public class AccountAdd extends AppCompatActivity {
                         public void run() {
                             try  {
                                 //Your code goes here
+                                S3ClientOptions s3ClientOptions = S3ClientOptions.builder().build();
+                                if (!endpoint.contains(getResources().getString(R.string.aws_endpoint))) {
+                                    s3ClientOptions.setPathStyleAccess(true);
+                                }
                                 myCredentials = new BasicAWSCredentials(username, password);
                                 s3client = new AmazonS3Client(myCredentials, region);
                                 s3client.setEndpoint(endpoint);
diff --git a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
index 70c445f..6ebcd8f 100644
--- a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
+++ b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
@@ -42,7 +42,9 @@ public class BucketSelect extends AppCompatActivity {
         setContentView(R.layout.activity_bucket_select);
         Region region = Region.getRegion(US_EAST_1);
         S3ClientOptions s3ClientOptions = S3ClientOptions.builder().build();
-        s3ClientOptions.setPathStyleAccess(true);
+        if (!endpoint.contains(getResources().getString(R.string.aws_endpoint))) {
+            s3ClientOptions.setPathStyleAccess(true);
+        }
         AWSCredentials myCredentials = new BasicAWSCredentials(username, password);
         AmazonS3 s3client = new AmazonS3Client(myCredentials, region);
         s3client.setEndpoint(endpoint);
diff --git a/app/src/main/java/asgardius/page/s3manager/FileShare.java b/app/src/main/java/asgardius/page/s3manager/FileShare.java
index e33dfa7..5bbbfc4 100644
--- a/app/src/main/java/asgardius/page/s3manager/FileShare.java
+++ b/app/src/main/java/asgardius/page/s3manager/FileShare.java
@@ -27,7 +27,9 @@ public class FileShare extends AppCompatActivity {
         prefix = getIntent().getStringExtra("prefix");
         Region region = Region.getRegion(US_EAST_1);
         S3ClientOptions s3ClientOptions = S3ClientOptions.builder().build();
-        s3ClientOptions.setPathStyleAccess(true);
+        if (!endpoint.contains(getResources().getString(R.string.aws_endpoint))) {
+            s3ClientOptions.setPathStyleAccess(true);
+        }
         AWSCredentials myCredentials = new BasicAWSCredentials(username, password);
         AmazonS3 s3client = new AmazonS3Client(myCredentials, region);
         s3client.setEndpoint(endpoint);
diff --git a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
index d79b69a..f044f9f 100644
--- a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
+++ b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
@@ -56,7 +56,9 @@ public class ObjectSelect extends AppCompatActivity {
         setContentView(R.layout.activity_object_select);
         Region region = Region.getRegion(US_EAST_1);
         S3ClientOptions s3ClientOptions = S3ClientOptions.builder().build();
-        s3ClientOptions.setPathStyleAccess(true);
+        if (!endpoint.contains(getResources().getString(R.string.aws_endpoint))) {
+            s3ClientOptions.setPathStyleAccess(true);
+        }
         AWSCredentials myCredentials = new BasicAWSCredentials(username, password);
         AmazonS3 s3client = new AmazonS3Client(myCredentials, region);
         s3client.setEndpoint(endpoint);
diff --git a/app/src/main/res/layout/activity_file_share.xml b/app/src/main/res/layout/activity_file_share.xml
index b7008ce..e7bffff 100644
--- a/app/src/main/res/layout/activity_file_share.xml
+++ b/app/src/main/res/layout/activity_file_share.xml
@@ -14,6 +14,7 @@
         android:focusable="false"
         android:gravity="start|top"
         android:inputType="textMultiLine"
+        android:text="Testting\nEditor"
         tools:ignore="MissingConstraints"
         tools:layout_editor_absoluteX="79dp"
         tools:layout_editor_absoluteY="25dp"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3025ba2..03d6ee8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
 <resources>
     <string name="app_name">S3 Manager</string>
+    <string name="aws_endpoint">.amazonaws.com</string>
     <string name="title_activity_video_player">VideoPlayer</string>
     <string name="broken_database">Local database is corrupted. Please reinstall this app</string>
     <string name="file_share">Share file</string>