diff --git a/CHANGELOG.md b/CHANGELOG.md
index eea88fe..1d6bb8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog Hiber API
 
+### 0.50 (2020-06-18)
+
+#### Changes
+
+##### ModemService
+
+- Fixed a bug when listing child organizations that could cause incomplete data.
+
+##### TokenService
+
+- Removed `override_allow_no_permissions` from `CreateTokenRequest` and `UpdateTokenOrganizationPermissionsRequest`.
+  The API would check whether a token was created with or updated to an empty set of organization permissions.
+  This was confusing to users, and since permissions can easily be updated, we opted to remove it.
+
+##### EmailNotificationPreferencesService
+
+- Fixed a bug where a user without the `PUBLISHERS` permission would not be able to update their email preferences.
+
 ### 0.49.1 (2020-06-04)
 
 #### Changes
diff --git a/permission.proto b/permission.proto
index 1d097c4..ea4e8ce 100644
--- a/permission.proto
+++ b/permission.proto
@@ -66,7 +66,7 @@ enum OrganizationPermission {
     /* Approve or create new users, remove users from the organization. Includes users permission. */
     USERS_MANAGE = 31;
 
-    /* Manage publishers. */
+    /* Manage publishers: webhooks, MQTT integration, AWS IoT integration and custom email publishers. */
     PUBLISHERS = 35;
     /* Manage tokens. */
     TOKENS = 36;
diff --git a/token.proto b/token.proto
index 7d7276e..8d1e9ab 100644
--- a/token.proto
+++ b/token.proto
@@ -61,8 +61,7 @@ message CreateTokenRequest {
     Filter.UserPermissions user_permissions = 5;
     Filter.OrganizationPermissions organization_permissions = 6;
 
-    /* The server returns an error when you don't specify organization permissions. Set this to true to allow it. */
-    bool override_allow_no_permissions = 7;
+    reserved 7;
 }
 
 message DeleteTokenRequest {
@@ -85,8 +84,7 @@ message UpdateTokenOrganizationPermissionsRequest {
     /* The previous permissions are replaced! */
     Filter.OrganizationPermissions new_organization_permissions = 3;
 
-    /* The server returns an error when you don't specify organization permissions. Set this to true to allow it. */
-    bool override_allow_no_permissions = 4;
+    reserved 4;
 }
 
 message UpdateTokenUserPermissionsRequest {