diff --git a/cmd/juju/commands/bootstrap.go b/cmd/juju/commands/bootstrap.go
index 6f37a16d3b2..b36ece053ff 100644
--- a/cmd/juju/commands/bootstrap.go
+++ b/cmd/juju/commands/bootstrap.go
@@ -184,8 +184,7 @@ func (c *bootstrapCommand) SetFlags(f *gnuflag.FlagSet) {
 	f.BoolVar(&c.showClouds, "clouds", false, "Print the available clouds which can be used to bootstrap a Juju environment")
 	f.StringVar(&c.showRegionsForCloud, "regions", "", "Print the available regions for the specified cloud")
 	f.BoolVar(&c.noGUI, "no-gui", false, "Do not install the Juju GUI in the controller when bootstrapping")
-	f.BoolVar(&c.noSwitch, "S", false, "Do not switch to the newly created controller")
-	f.BoolVar(&c.noSwitch, "no-switch", false, "")
+	f.BoolVar(&c.noSwitch, "no-switch", false, "Do not switch to the newly created controller")
 }
 
 func (c *bootstrapCommand) Init(args []string) (err error) {
diff --git a/cmd/juju/controller/addmodel.go b/cmd/juju/controller/addmodel.go
index 844e9bad634..865969ba6a8 100644
--- a/cmd/juju/controller/addmodel.go
+++ b/cmd/juju/controller/addmodel.go
@@ -116,8 +116,7 @@ func (c *addModelCommand) SetFlags(f *gnuflag.FlagSet) {
 	f.StringVar(&c.Owner, "owner", "", "The owner of the new model if not the current user")
 	f.StringVar(&c.CredentialName, "credential", "", "Credential used to add the model")
 	f.Var(&c.Config, "config", "Path to YAML model configuration file or individual options (--config config.yaml [--config key=value ...])")
-	f.BoolVar(&c.noSwitch, "S", false, "Do not switch to the newly created controller")
-	f.BoolVar(&c.noSwitch, "no-switch", false, "")
+	f.BoolVar(&c.noSwitch, "no-switch", false, "Do not switch to the newly created controller")
 }
 
 func (c *addModelCommand) Init(args []string) error {