diff --git a/bitbucket/payload.go b/bitbucket/payload.go
index 683914c..3edbe52 100644
--- a/bitbucket/payload.go
+++ b/bitbucket/payload.go
@@ -348,8 +348,9 @@ type PullRequestCommentDeletedPayload struct {
 // Owner is the common Bitbucket Owner Sub Entity
 type Owner struct {
 	Type        string `json:"type"`
-	Username    string `json:"username"`
+	NickName    string `json:"nickname"`
 	DisplayName string `json:"display_name"`
+	AccountId   string `json:"account_id"`
 	UUID        string `json:"uuid"`
 	Links       struct {
 		Self struct {
diff --git a/testdata/bitbucket/commit-comment-created.json b/testdata/bitbucket/commit-comment-created.json
index d95fa80..0cc7de6 100644
--- a/testdata/bitbucket/commit-comment-created.json
+++ b/testdata/bitbucket/commit-comment-created.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/issue-comment-created.json b/testdata/bitbucket/issue-comment-created.json
index e80d6e5..587e44c 100644
--- a/testdata/bitbucket/issue-comment-created.json
+++ b/testdata/bitbucket/issue-comment-created.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/issue-created.json b/testdata/bitbucket/issue-created.json
index cbd5ca9..77bacb5 100644
--- a/testdata/bitbucket/issue-created.json
+++ b/testdata/bitbucket/issue-created.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/issue-updated.json b/testdata/bitbucket/issue-updated.json
index 1323ac2..e017b1e 100644
--- a/testdata/bitbucket/issue-updated.json
+++ b/testdata/bitbucket/issue-updated.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/pull-request-approval-removed.json b/testdata/bitbucket/pull-request-approval-removed.json
index d7fe2f1..db2df05 100644
--- a/testdata/bitbucket/pull-request-approval-removed.json
+++ b/testdata/bitbucket/pull-request-approval-removed.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -177,15 +182,16 @@
   "approval":{
     "date":"2015-04-06T16:34:59.195330+00:00",
     "user":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/pull-request-approved.json b/testdata/bitbucket/pull-request-approved.json
index d7fe2f1..db2df05 100644
--- a/testdata/bitbucket/pull-request-approved.json
+++ b/testdata/bitbucket/pull-request-approved.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -177,15 +182,16 @@
   "approval":{
     "date":"2015-04-06T16:34:59.195330+00:00",
     "user":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/pull-request-comment-created.json b/testdata/bitbucket/pull-request-comment-created.json
index 413b631..bf99f34 100644
--- a/testdata/bitbucket/pull-request-comment-created.json
+++ b/testdata/bitbucket/pull-request-comment-created.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -39,15 +40,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +113,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +132,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -147,15 +151,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/pull-request-comment-deleted.json b/testdata/bitbucket/pull-request-comment-deleted.json
index 413b631..bf99f34 100644
--- a/testdata/bitbucket/pull-request-comment-deleted.json
+++ b/testdata/bitbucket/pull-request-comment-deleted.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -39,15 +40,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +113,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +132,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -147,15 +151,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/pull-request-comment-updated.json b/testdata/bitbucket/pull-request-comment-updated.json
index 413b631..bf99f34 100644
--- a/testdata/bitbucket/pull-request-comment-updated.json
+++ b/testdata/bitbucket/pull-request-comment-updated.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -39,15 +40,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +113,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +132,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -147,15 +151,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/pull-request-created.json b/testdata/bitbucket/pull-request-created.json
index a5a8c42..e25dc7c 100644
--- a/testdata/bitbucket/pull-request-created.json
+++ b/testdata/bitbucket/pull-request-created.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/pull-request-declined.json b/testdata/bitbucket/pull-request-declined.json
index a5a8c42..e25dc7c 100644
--- a/testdata/bitbucket/pull-request-declined.json
+++ b/testdata/bitbucket/pull-request-declined.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/pull-request-merged.json b/testdata/bitbucket/pull-request-merged.json
index a5a8c42..08bd258 100644
--- a/testdata/bitbucket/pull-request-merged.json
+++ b/testdata/bitbucket/pull-request-merged.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -98,10 +100,10 @@
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +113,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +132,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/pull-request-updated.json b/testdata/bitbucket/pull-request-updated.json
index a5a8c42..e25dc7c 100644
--- a/testdata/bitbucket/pull-request-updated.json
+++ b/testdata/bitbucket/pull-request-updated.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/repo-commit-status-created.json b/testdata/bitbucket/repo-commit-status-created.json
index 39c94a1..dcec4e8 100644
--- a/testdata/bitbucket/repo-commit-status-created.json
+++ b/testdata/bitbucket/repo-commit-status-created.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/repo-commit-status-updated.json b/testdata/bitbucket/repo-commit-status-updated.json
index 4d0f8a1..e5e180c 100644
--- a/testdata/bitbucket/repo-commit-status-updated.json
+++ b/testdata/bitbucket/repo-commit-status-updated.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/repo-fork.json b/testdata/bitbucket/repo-fork.json
index 5e2be9a..b41ec74 100644
--- a/testdata/bitbucket/repo-fork.json
+++ b/testdata/bitbucket/repo-fork.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/repo-push.json b/testdata/bitbucket/repo-push.json
index fa7d0fe..eb8c6db 100644
--- a/testdata/bitbucket/repo-push.json
+++ b/testdata/bitbucket/repo-push.json
@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -43,15 +44,16 @@
             "type":"commit",
             "hash":"709d658dc5b6d6afcd46049c2f332ee3f515a67d",
             "author":{
-              "username":"emmap1",
+              "nickname":"emmap1",
+              "account_id":"udfy9suggmzpswxc7n200y3c",
               "display_name":"Emma",
               "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
               "links":{
                 "self":{
-                  "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+                  "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "html":{
-                  "href":"https://api.bitbucket.org/emmap1"
+                  "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "avatar":{
                   "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -102,15 +104,16 @@
             "type":"commit",
             "hash":"1e65c05c1d5171631d92438a13901ca7dae9618c",
             "author":{
-              "username":"emmap1",
+              "nickname":"emmap1",
+              "account_id":"udfy9suggmzpswxc7n200y3c",
               "display_name":"Emma",
               "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
               "links":{
                 "self":{
-                  "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+                  "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "html":{
-                  "href":"https://api.bitbucket.org/emmap1"
+                  "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "avatar":{
                   "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -174,15 +177,16 @@
             "type":"commit",
             "message":"commit message\n",
             "author":{
-              "username":"emmap1",
+              "nickname":"emmap1",
+              "account_id":"udfy9suggmzpswxc7n200y3c",
               "display_name":"Emma",
               "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
               "links":{
                 "self":{
-                  "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+                  "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "html":{
-                  "href":"https://api.bitbucket.org/emmap1"
+                  "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "avatar":{
                   "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
diff --git a/testdata/bitbucket/repo-updated.json b/testdata/bitbucket/repo-updated.json
index 4e62d1b..85d5e55 100644
--- a/testdata/bitbucket/repo-updated.json
+++ b/testdata/bitbucket/repo-updated.json
@@ -1,15 +1,16 @@
 {
   "actor": {
     "type": "user",
-    "username": "emmap1",
+    "nickname": "emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name": "Emma",
     "uuid": "{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links": {
       "self": {
-        "href": "https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href": "https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html": {
-        "href": "https://api.bitbucket.org/emmap1"
+        "href": "https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar": {
         "href": "https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -49,15 +50,16 @@
     "website": "https://mywebsite.com/",
     "owner": {
       "type": "user",
-      "username": "emmap1",
+      "nickname": "emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name": "Emma",
       "uuid": "{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links": {
         "self": {
-          "href": "https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href": "https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html": {
-          "href": "https://api.bitbucket.org/emmap1"
+          "href": "https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar": {
           "href": "https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"