diff --git a/src/main/java/com/auth0/json/mgmt/connections/Connection.java b/src/main/java/com/auth0/json/mgmt/connections/Connection.java
index 5cf63cc8d..a26a9c1af 100644
--- a/src/main/java/com/auth0/json/mgmt/connections/Connection.java
+++ b/src/main/java/com/auth0/json/mgmt/connections/Connection.java
@@ -35,9 +35,9 @@ public class Connection {
     @JsonProperty("realms")
     private List<String> realms;
     @JsonProperty("show_as_button")
-    private boolean showAsButton;
+    private Boolean showAsButton;
     @JsonProperty("is_domain_connection")
-    private boolean isDomainConnection;
+    private Boolean isDomainConnection;
 
     public Connection() {
     }
@@ -193,7 +193,8 @@ public void setRealms(List<String> realms) {
      *
      * @return the show as button flag.
      */
-    public boolean isShowAsButton() {
+    @JsonProperty("show_as_button")
+    public Boolean isShowAsButton() {
         return showAsButton;
     }
 
@@ -202,7 +203,8 @@ public boolean isShowAsButton() {
      *
      * @param showAsButton the show as button flag to set.
      */
-    public void setShowAsButton(boolean showAsButton) {
+    @JsonProperty("show_as_button")
+    public void setShowAsButton(Boolean showAsButton) {
         this.showAsButton = showAsButton;
     }
 
@@ -210,7 +212,8 @@ public void setShowAsButton(boolean showAsButton) {
      * Getter for the domain connection flag.
      * @return the domain connection flag.
      */
-    public boolean isDomainConnection() {
+    @JsonProperty("is_domain_connection")
+    public Boolean isDomainConnection() {
         return isDomainConnection;
     }
 
@@ -218,7 +221,8 @@ public boolean isDomainConnection() {
      * Setter for the domain connection flag.
      * @param domainConnection the domain connection flag to set.
      */
-    public void setDomainConnection(boolean domainConnection) {
-        isDomainConnection = domainConnection;
+    @JsonProperty("is_domain_connection")
+    public void setDomainConnection(Boolean domainConnection) {
+        this.isDomainConnection = domainConnection;
     }
 }
diff --git a/src/test/java/com/auth0/client/mgmt/ConnectionsEntityTest.java b/src/test/java/com/auth0/client/mgmt/ConnectionsEntityTest.java
index afcd0457f..e918723f2 100644
--- a/src/test/java/com/auth0/client/mgmt/ConnectionsEntityTest.java
+++ b/src/test/java/com/auth0/client/mgmt/ConnectionsEntityTest.java
@@ -176,7 +176,10 @@ public void shouldThrowOnCreateConnectionWithNullData() {
 
     @Test
     public void shouldCreateConnection() throws Exception {
-        Request<Connection> request = api.connections().create(new Connection("my-connection", "auth0"));
+        Connection createConnection = new Connection("my-connection", "auth0");
+        createConnection.setDomainConnection(true);
+        createConnection.setShowAsButton(true);
+        Request<Connection> request = api.connections().create(createConnection);
         assertThat(request, is(notNullValue()));
 
         server.jsonResponse(MGMT_CONNECTION, 200);
@@ -188,7 +191,7 @@ public void shouldCreateConnection() throws Exception {
         assertThat(recordedRequest, hasHeader("Authorization", "Bearer apiToken"));
 
         Map<String, Object> body = bodyFromRequest(recordedRequest);
-        assertThat(body.size(), is(5));
+        assertThat(body.size(), is(4));
         assertThat(body, hasEntry("name", "my-connection"));
         assertThat(body, hasEntry("strategy", "auth0"));
 
@@ -244,7 +247,7 @@ public void shouldUpdateConnection() throws Exception {
         assertThat(recordedRequest, hasHeader("Authorization", "Bearer apiToken"));
 
         Map<String, Object> body = bodyFromRequest(recordedRequest);
-        assertThat(body.size(), is(5));
+        assertThat(body.size(), is(2));
         assertThat(body, hasEntry("name", "my-connection"));
         assertThat(body, hasEntry("strategy", "auth0"));
 
diff --git a/src/test/resources/mgmt/connection.json b/src/test/resources/mgmt/connection.json
index b94306245..f2f51e098 100644
--- a/src/test/resources/mgmt/connection.json
+++ b/src/test/resources/mgmt/connection.json
@@ -8,6 +8,8 @@
     "ScKKdrpyUwfkhOQP6KXItH32INgZf7Rb"
   ],
   "metadata": {
-  	"key": "value"
-  }
-}
\ No newline at end of file
+    "key": "value"
+  },
+  "is_domain_connection": true,
+  "show_as_button": true
+}