diff --git a/command/auth.go b/command/auth.go
index e42c05cbdd..88a1d27d75 100644
--- a/command/auth.go
+++ b/command/auth.go
@@ -34,10 +34,11 @@ type AuthCommand struct {
 
 func (c *AuthCommand) Run(args []string) int {
 	var method string
-	var methods, methodHelp bool
+	var methods, methodHelp, noVerify bool
 	flags := c.Meta.FlagSet("auth", FlagSetDefault)
 	flags.BoolVar(&methods, "methods", false, "")
 	flags.BoolVar(&methodHelp, "method-help", false, "")
+	flags.BoolVar(&noVerify, "no-verify", false, "")
 	flags.StringVar(&method, "method", "", "method")
 	flags.Usage = func() { c.Ui.Error(c.Help()) }
 	if err := flags.Parse(args); err != nil {
@@ -170,6 +171,14 @@ func (c *AuthCommand) Run(args []string) int {
 		return 1
 	}
 
+	if noVerify {
+		c.Ui.Output(fmt.Sprintf(
+			"Authenticated - no token verification has been performed.",
+		))
+
+		return 0
+	}
+
 	// Verify the token
 	secret, err := client.Logical().Read("auth/token/lookup-self")
 	if err != nil {
@@ -273,6 +282,9 @@ Auth Options:
 
   -methods          List the available auth methods.
 
+  -no-verify        Do not verify the token after creation; avoids a use count
+                    decrement.
+
 `
 	return strings.TrimSpace(helpText)
 }
diff --git a/vault/token_store.go b/vault/token_store.go
index d1b971c743..f27f5450d7 100644
--- a/vault/token_store.go
+++ b/vault/token_store.go
@@ -75,10 +75,6 @@ func NewTokenStore(c *Core) (*TokenStore, error) {
 			Root: []string{
 				"revoke-prefix/*",
 			},
-
-			Unauthenticated: []string{
-				"lookup-self",
-			},
 		},
 
 		Paths: []*framework.Path{