diff --git a/auth/options.go b/auth/options.go
index 5aa08582..be3354f8 100644
--- a/auth/options.go
+++ b/auth/options.go
@@ -196,6 +196,8 @@ type TokenOptions struct {
 	RefreshToken string
 	// Expiry is the time the token should live for
 	Expiry time.Duration
+	// Issuer of the account
+	Issuer string
 }
 
 type TokenOption func(o *TokenOptions)
@@ -220,6 +222,12 @@ func WithToken(rt string) TokenOption {
 	}
 }
 
+func WithTokenIssuer(iss string) TokenOption {
+	return func(o *TokenOptions) {
+		o.Issuer = iss
+	}
+}
+
 // NewTokenOptions from a slice of options
 func NewTokenOptions(opts ...TokenOption) TokenOptions {
 	var options TokenOptions
diff --git a/auth/service/service.go b/auth/service/service.go
index 2c07016c..58be9df0 100644
--- a/auth/service/service.go
+++ b/auth/service/service.go
@@ -193,6 +193,9 @@ func (s *svc) Inspect(token string) (*auth.Account, error) {
 // Token generation using an account ID and secret
 func (s *svc) Token(opts ...auth.TokenOption) (*auth.Token, error) {
 	options := auth.NewTokenOptions(opts...)
+	if len(options.Issuer) == 0 {
+		options.Issuer = s.options.Issuer
+	}
 
 	// we have the JWT private key and refresh accounts locally
 	if len(s.options.PrivateKey) > 0 {
@@ -224,7 +227,7 @@ func (s *svc) Token(opts ...auth.TokenOption) (*auth.Token, error) {
 		RefreshToken: options.RefreshToken,
 		TokenExpiry:  int64(options.Expiry.Seconds()),
 		Options: &pb.Options{
-			Namespace: s.Options().Issuer,
+			Namespace: options.Issuer,
 		},
 	}, s.callOpts()...)
 	if err != nil {