diff --git a/shared.go b/shared.go
index 6726ef2..3e72f77 100755
--- a/shared.go
+++ b/shared.go
@@ -10097,7 +10097,9 @@ func HandleCreateSubOrg(resp http.ResponseWriter, request *http.Request) {
 		ActiveApps: newApps,
 	}
 
-	newOrg.Defaults.KmsId = ""
+	// FIXME: This may be good to auto distribute no matter what
+	// Then maybe the kms problem won't happen
+	//newOrg.Defaults.KmsId = ""
 
 	parentOrg.ChildOrgs = append(parentOrg.ChildOrgs, OrgMini{
 		Name: tmpData.Name,
diff --git a/structs.go b/structs.go
index f516069..fd98e62 100755
--- a/structs.go
+++ b/structs.go
@@ -1392,6 +1392,7 @@ type File struct {
 type AppAuthenticationGroup struct {
 	Active			bool                  `json:"active" datastore:"active"`
 	Label			string                `json:"label" datastore:"label"`
+	Environment		string                `json:"environment" datastore:"environment"`
 	Id				string                `json:"id" datastore:"id"`
 	AppAuths		[]AppAuthenticationStorage `json:"app_auths" datastore:"app_auths"`	
 	Description		string                `json:"description" datastore:"description"`