diff --git a/examples/services/aws-autoscaler/aws_autoscaler.py b/examples/services/aws-autoscaler/aws_autoscaler.py
index 2698b01c..04e4a8e8 100644
--- a/examples/services/aws-autoscaler/aws_autoscaler.py
+++ b/examples/services/aws-autoscaler/aws_autoscaler.py
@@ -99,8 +99,8 @@ def run_wizard():
     )
     hyper_params.cloud_credentials_region = get_input(
         "AWS region name",
-        "[us-east-1b]",
-        default='us-east-1b')
+        "[us-east-1]",
+        default='us-east-1')
     # get GIT User/Pass for cloning
     print(
         "\nGIT credentials:"
@@ -211,7 +211,7 @@ def run_wizard():
                                if k not in (q[0] for q in queues[queue_name])]
             while True:
                 queue_type = get_input(
-                    "a instance type to attach to the queue",
+                    "an instance type to attach to the queue",
                     "{}".format(valid_instances),
                     question="Select",
                     required=True,
diff --git a/trains/automation/aws_auto_scaler.py b/trains/automation/aws_auto_scaler.py
index 4d1294fb..56ffca30 100644
--- a/trains/automation/aws_auto_scaler.py
+++ b/trains/automation/aws_auto_scaler.py
@@ -82,8 +82,8 @@ class AwsAutoScaler(AutoScaler):
             access_key=self.access_key,
             secret_key=self.secret_key,
             queue=queue_name,
-            git_user=self.git_user,
-            git_pass=self.git_pass,
+            git_user=self.git_user or "",
+            git_pass=self.git_pass or "",
             trains_conf=self.extra_trains_conf,
             bash_script=self.extra_vm_bash_script,
             docker="--docker '{}'".format(self.default_docker_image)