diff --git a/jira/jira.go b/jira/jira.go
index 34415607..39aa7136 100644
--- a/jira/jira.go
+++ b/jira/jira.go
@@ -81,7 +81,7 @@ func (js jwtSource) Token() (*oauth2.Token, error) {
 	exp := time.Duration(59) * time.Second
 	claimSet := &ClaimSet{
 		Issuer:       fmt.Sprintf("urn:atlassian:connect:clientid:%s", js.conf.ClientID),
-		Subject:      fmt.Sprintf("urn:atlassian:connect:userkey:%s", js.conf.Subject),
+		Subject:      fmt.Sprintf("urn:atlassian:connect:useraccountid:%s", js.conf.Subject),
 		InstalledURL: js.conf.BaseURL,
 		AuthURL:      js.conf.Endpoint.AuthURL,
 		IssuedAt:     time.Now().Unix(),
diff --git a/jira/jira_test.go b/jira/jira_test.go
index c49940df..07f6a631 100644
--- a/jira/jira_test.go
+++ b/jira/jira_test.go
@@ -30,7 +30,7 @@ func TestJWTFetch_JSONResponse(t *testing.T) {
 
 	conf := &Config{
 		BaseURL: "https://my.app.com",
-		Subject: "userkey",
+		Subject: "useraccountId",
 		Config: oauth2.Config{
 			ClientID:     "super_secret_client_id",
 			ClientSecret: "super_shared_secret",
@@ -69,7 +69,7 @@ func TestJWTFetch_BadResponse(t *testing.T) {
 
 	conf := &Config{
 		BaseURL: "https://my.app.com",
-		Subject: "userkey",
+		Subject: "useraccountId",
 		Config: oauth2.Config{
 			ClientID:     "super_secret_client_id",
 			ClientSecret: "super_shared_secret",
@@ -108,7 +108,7 @@ func TestJWTFetch_BadResponseType(t *testing.T) {
 
 	conf := &Config{
 		BaseURL: "https://my.app.com",
-		Subject: "userkey",
+		Subject: "useraccountId",
 		Config: oauth2.Config{
 			ClientID:     "super_secret_client_id",
 			ClientSecret: "super_shared_secret",
@@ -145,7 +145,7 @@ func TestJWTFetch_Assertion(t *testing.T) {
 
 	conf := &Config{
 		BaseURL: "https://my.app.com",
-		Subject: "userkey",
+		Subject: "useraccountId",
 		Config: oauth2.Config{
 			ClientID:     "super_secret_client_id",
 			ClientSecret: "super_shared_secret",