diff --git a/portainer.py b/portainer.py
index f6ff314..ff1447a 100755
--- a/portainer.py
+++ b/portainer.py
@@ -18,14 +18,15 @@ defaults = {
     "stack": "my_stack",
     "deploy_mode": "git",
     "autostart": True,
-    "stack_mode": "swarm"
+    "stack_mode": "swarm",
+    "site": "portainer"
 }
 
 
 parser = argparse.ArgumentParser(description="Portainer helper - use env vars or pass credentials.")
 parser.add_argument("--base", "-b", default=os.getenv("PORTAINER_URL", "https://portainer.example.com"),
                     help="Base URL for Portainer (ENV: PORTAINER_URL)")
-parser.add_argument("--site", "-t", type=str, default="portainer", help="Site")
+parser.add_argument("--site", "-t", type=str, default=None, help="Site")
 parser.add_argument("--endpoint-id", "-e", type=str, default=None, help="Endpoint ID to limit stack operations")
 parser.add_argument("--refresh-environment", "-R", action="store_true", help="List endpoints")
 parser.add_argument("--list-endpoints","-E", action="store_true", help="List endpoints")
@@ -157,12 +158,15 @@ if __name__ == "__main__":
 
     if args.action == "create_stack":
         if args.endpoint_id == None:
-            args.endpoint_id  = input("Endpoint ID is required for creating stacks : ") or defaults["endpoint_id"]
+            args.endpoint_id  = input(f"Endpoint ID (default={defaults["endpoint_id"]}) : ") or defaults["endpoint_id"]
         if args.stack == None:
-            args.stack  = input("Stack name or ID is required for creating stacks : ")
+            args.stack  = input(f"Stack name or ID : ")
         if args.stack_mode == None:
-            args.stack_mode  = input("Stack mode (swarm or compose) default=swarm: ") or defaults["stack_mode"]
-            
+            args.stack_mode  = input(f"Stack mode (swarm or compose) (default={defaults["stack_mode"]}) : ") or defaults["stack_mode"]
+        if args.deploy_mode == None:
+            args.deploy_mode  = input(f"Deploy mode (git or upload) (default={defaults["deploy_mode"]}) : ") or defaults["deploy_mode"]
+        if args.site == None:
+            args.site  = input(f"Site (default={defaults["site"]}) : ") or defaults["site"]
         por.create_stack(args.endpoint_id,args.stack, args.deploy_mode, args.autostart, args.stack_mode)
         sys.exit()