diff --git a/platformio/commands/remote.py b/platformio/commands/remote.py
index f1c03515..07b0e408 100644
--- a/platformio/commands/remote.py
+++ b/platformio/commands/remote.py
@@ -42,7 +42,7 @@ def remote_agent():
 
 @remote_agent.command("start", short_help="Start agent")
 @click.option("-n", "--name")
-@click.option("-s", "--share")
+@click.option("-s", "--share", metavar="E-MAIL")
 def remote_agent_start(**kwargs):
     pioplus_call(sys.argv[1:])
 
diff --git a/platformio/telemetry.py b/platformio/telemetry.py
index 0a8c28f2..535ee5be 100644
--- a/platformio/telemetry.py
+++ b/platformio/telemetry.py
@@ -111,8 +111,7 @@ class MeasurementProtocol(TelemetryBase):
         if not args:
             return
         cmd_path = args[:1]
-        if args[0] in ("lib", "platform", "device", "settings",
-                       "remote"):
+        if args[0] in ("lib", "platform", "device", "settings", "remote"):
             cmd_path = args[:2]
             if args[0] == "remote":
                 if len(args) > 2 and args[1] in ("agent", "device"):