diff --git a/portainer.py b/portainer.py
index 2dbfdfb..73df598 100755
--- a/portainer.py
+++ b/portainer.py
@@ -354,6 +354,10 @@ def prompt_missing_args(args_in, defaults_in, fields, action=None,stacks=None):
         
         if field == "site" and value_in != cur_site:
             por.get_site(value_in)
+            if value_in == "portainer":
+                defaults_in["PORTAINER_ENDPOINT_ID"] = "m-s"
+            elif value_in == "port":
+                defaults_in["PORTAINER_ENDPOINT_ID"] = "vm01"
         if field == "stack" and value_in != cur_site:
             os.environ[field] = ",".join(value_in)
         else: