diff --git a/cmd/api/v5/ipsec.go b/cmd/api/v5/ipsec.go
index 175342a..fc16b20 100644
--- a/cmd/api/v5/ipsec.go
+++ b/cmd/api/v5/ipsec.go
@@ -107,11 +107,11 @@ func (o IPSecTunnel) Commands() *cli.Command {
 				Usage: "Add a ipsec tunnel",
 				Flags: []cli.Flag{
 					&cli.StringFlag{Name: "remote", Required: true},
-					&cli.StringFlag{Name: "remoteid"},
+					&cli.StringFlag{Name: "remoteid", Required: true},
 					&cli.IntFlag{Name: "remoteport"},
 					&cli.StringFlag{Name: "protocol", Required: true},
 					&cli.StringFlag{Name: "secret", Required: true},
-					&cli.StringFlag{Name: "localid"},
+					&cli.StringFlag{Name: "localid", Required: true},
 					&cli.IntFlag{Name: "localport"},
 				},
 				Action: o.Add,
diff --git a/pkg/switch/ipsec.go b/pkg/switch/ipsec.go
index 2843753..303ee90 100644
--- a/pkg/switch/ipsec.go
+++ b/pkg/switch/ipsec.go
@@ -95,7 +95,7 @@ conn {{ .Name }}-c1
     rightprotoport=gre
 `
 	secretTmpl = `
-%any {{ .RightId }}.{{ .Transport }} : PSK "{{ .Secret }}"
+%any @{{ .RightId }}.{{ .Transport }} : PSK "{{ .Secret }}"
 `
 )