diff --git a/management/server/account_test.go b/management/server/account_test.go
index c0b022138..7120f046e 100644
--- a/management/server/account_test.go
+++ b/management/server/account_test.go
@@ -267,7 +267,7 @@ func TestAccountManager_AddAccount(t *testing.T) {
 	expectedSetupKeysSize := 2
 	expectedNetwork := net.IPNet{
 		IP:   net.IP{100, 64, 0, 0},
-		Mask: net.IPMask{255, 192, 0, 0},
+		Mask: net.IPMask{255, 255, 0, 0},
 	}
 
 	account, err := manager.AddAccount(expectedId, userId, "")
diff --git a/management/server/grpcserver.go b/management/server/grpcserver.go
index d7d090b94..d35d0adb4 100644
--- a/management/server/grpcserver.go
+++ b/management/server/grpcserver.go
@@ -365,7 +365,7 @@ func toWiretrusteeConfig(config *Config, turnCredentials *TURNCredentials) *prot
 
 func toPeerConfig(peer *Peer) *proto.PeerConfig {
 	return &proto.PeerConfig{
-		Address: peer.IP.String() + "/24", // todo make it explicit
+		Address: peer.IP.String() + "/16", // todo make it explicit
 	}
 }
 
diff --git a/management/server/management_proto_test.go b/management/server/management_proto_test.go
index e2850a665..09e9e668c 100644
--- a/management/server/management_proto_test.go
+++ b/management/server/management_proto_test.go
@@ -251,7 +251,7 @@ func Test_SyncProtocol(t *testing.T) {
 		t.Fatal("expecting SyncResponse to have NetworkMap with a non-nil PeerConfig")
 	}
 
-	if networkMap.GetPeerConfig().GetAddress() != "100.64.0.1/24" {
+	if networkMap.GetPeerConfig().GetAddress() != "100.64.0.1/16" {
 		t.Fatal("expecting SyncResponse to have NetworkMap with a PeerConfig having valid Address")
 	}
 
diff --git a/management/server/management_test.go b/management/server/management_test.go
index f13e10fd0..f6fcbbe81 100644
--- a/management/server/management_test.go
+++ b/management/server/management_test.go
@@ -107,7 +107,7 @@ var _ = Describe("Management service", func() {
 				err = encryption.DecryptMessage(serverPubKey, key, encryptedResponse.Body, resp)
 				Expect(err).NotTo(HaveOccurred())
 
-				Expect(resp.PeerConfig.Address).To(BeEquivalentTo("100.64.0.1/24"))
+				Expect(resp.PeerConfig.Address).To(BeEquivalentTo("100.64.0.1/16"))
 
 				expectedSignalConfig := &mgmtProto.HostConfig{
 					Uri:      "signal.wiretrustee.com:10000",
diff --git a/management/server/network.go b/management/server/network.go
index 22ec811e2..f2fb0831d 100644
--- a/management/server/network.go
+++ b/management/server/network.go
@@ -33,7 +33,7 @@ type Network struct {
 func NewNetwork() *Network {
 	return &Network{
 		Id:     xid.New().String(),
-		Net:    net.IPNet{IP: net.ParseIP("100.64.0.0"), Mask: net.IPMask{255, 192, 0, 0}},
+		Net:    net.IPNet{IP: net.ParseIP("100.64.0.0"), Mask: net.IPMask{255, 255, 0, 0}},
 		Dns:    "",
 		Serial: 0}
 }