diff --git a/src/views/partials/communities/page-community-edit.pug b/src/views/partials/communities/page-community-edit.pug
index fcc9aaca269ff8c8fdf25b08d92fec3853d1749e..81dfa522d7a29919f3a9b9564e8182af1a46f074 100644
--- a/src/views/partials/communities/page-community-edit.pug
+++ b/src/views/partials/communities/page-community-edit.pug
@@ -11,128 +11,106 @@ div.bg-color-white
 
   div.segment.full.padding-large.whitespace-normal
 
-    //- solid-ac-checker(permission="acl:Write", bind-resources)
-    div.loader.loader-top(id=`loader-${component.route}-edit`)
-      div
-      div
-      div
-      div
+    solid-ac-checker(permission="acl:Write", bind-resources)
+      div.loader.loader-top(id=`loader-${component.route}-edit`)
+        div
+        div
+        div
+        div
 
-    solid-form.form(
-      bind-resources
-      loader-id=`loader-${component.route}-edit`
+      solid-form.form(
+        bind-resources
+        loader-id=`loader-${component.route}-edit`
 
-      fields="profile.shortDescription, profile.description, segment(logo), profile.website, profile.email, profile.phone, profile.tweeter, profile.facebook, profile.linkedin, segment1(profile.instagram)"
+        fields="profile.shortDescription, profile.description, segment(logo), profile.website, profile.email, profile.phone, profile.tweeter, profile.facebook, profile.linkedin, segment1(profile.instagram)"
 
-      label-profile.shortDescription=""
-      label-profile.description=""
-      label-logo=""
-      label-profile.website=""
-      label-profile.email=""
-      label-profile.phone=""
-      label-profile.tweeter=""
-      label-profile.facebook=""
-      label-profile.linkedin=""
-      label-profile.instagram=""
+        label-profile.shortDescription=""
+        label-profile.description=""
+        label-logo=""
+        label-profile.website=""
+        label-profile.email=""
+        label-profile.phone=""
+        label-profile.tweeter=""
+        label-profile.facebook=""
+        label-profile.linkedin=""
+        label-profile.instagram=""
 
-      class-profile.shortDescription="segment margin-bottom-medium full sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
-      class-profile.description="segment margin-bottom-medium full text-small text-semibold text-uppercase text-color-heading"
+        class-profile.shortDescription="segment margin-bottom-medium full sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
+        class-profile.description="segment margin-bottom-medium full text-small text-semibold text-uppercase text-color-heading"
 
-      class-segment="segment full"
-      class-logo="segment margin-bottom-medium full sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
-      class-profile.website="segment margin-bottom-medium third sm-full padding-right-small sm-padding-none"
-      class-profile.email="segment margin-bottom-medium third sm-full padding-right-small padding-left-small sm-padding-none"
-      class-profile.phone="segment margin-bottom-medium third sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
+        class-segment="segment full"
+        class-logo="segment margin-bottom-medium full sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
+        class-profile.website="segment margin-bottom-medium third sm-full padding-right-small sm-padding-none"
+        class-profile.email="segment margin-bottom-medium third sm-full padding-right-small padding-left-small sm-padding-none"
+        class-profile.phone="segment margin-bottom-medium third sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
 
-      class-profile.tweeter="segment margin-bottom-medium third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
-      class-profile.facebook="segment margin-bottom-medium third sm-full padding-right-small padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
-      class-profile.linkedin="segment margin-bottom-medium third sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
-      class-segment1="segment full"
-      class-profile.instagram="segment margin-bottom-medium third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
+        class-profile.tweeter="segment margin-bottom-medium third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
+        class-profile.facebook="segment margin-bottom-medium third sm-full padding-right-small padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
+        class-profile.linkedin="segment margin-bottom-medium third sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
+        class-segment1="segment full"
+        class-profile.instagram="segment margin-bottom-medium third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
 
-      widget-profile.description="solid-form-richtext-label"
-      widget-profile.email="hubl-communities-edit-email"
-      widget-profile.website="hubl-communities-edit-website"
-      upload-url-logo=component.endpoints.uploads
-      widget-logo="solid-form-image-label"
+        widget-profile.description="solid-form-richtext-label"
+        widget-profile.email="hubl-communities-edit-email"
+        widget-profile.website="hubl-communities-edit-website"
+        upload-url-logo=component.endpoints.uploads
+        widget-logo="solid-form-image-label"
 
-      submit-button=""
-      submit-widget="button"
+        submit-button=""
+        submit-widget="button"
 
-      data-trans="label-logo=communities.edit.labelLogo;label-profile.shortDescription=communities.edit.labelShortDescription;label-profile.description=communities.edit.labelDescription;label-profile.phone=communities.edit.labelPhone;label-profile.tweeter=communities.edit.labelTwitter;label-profile.facebook=communities.edit.labelFacebook;label-profile.linkedin=communities.edit.labelLinkedin;label-profile.instagram=communities.edit.labelInstagram;submit-button=communities.edit.buttonSubmit"
-    )
+        data-trans="label-logo=communities.edit.labelLogo;label-profile.shortDescription=communities.edit.labelShortDescription;label-profile.description=communities.edit.labelDescription;label-profile.phone=communities.edit.labelPhone;label-profile.tweeter=communities.edit.labelTwitter;label-profile.facebook=communities.edit.labelFacebook;label-profile.linkedin=communities.edit.labelLinkedin;label-profile.instagram=communities.edit.labelInstagram;submit-button=communities.edit.buttonSubmit"
+      )
 
-    h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans="communities.edit.subTitle")
+      h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans="communities.edit.subTitle")
 
-    solid-form.form(
-      bind-resources
+      solid-form.form(
+        bind-resources
 
-      fields="profile.picture1, profile.picture2, profile.picture3"
+        fields="profile.picture1, profile.picture2, profile.picture3"
 
-      upload-url-profile.picture1=component.endpoints.uploads
-      upload-url-profile.picture2=component.endpoints.uploads
-      upload-url-profile.picture3=component.endpoints.uploads
+        upload-url-profile.picture1=component.endpoints.uploads
+        upload-url-profile.picture2=component.endpoints.uploads
+        upload-url-profile.picture3=component.endpoints.uploads
 
-      widget-profile.picture1="solid-form-image-label"
-      widget-profile.picture2="solid-form-image-label"
-      widget-profile.picture3="solid-form-image-label"
+        widget-profile.picture1="solid-form-image-label"
+        widget-profile.picture2="solid-form-image-label"
+        widget-profile.picture3="solid-form-image-label"
 
-      label-profile.picture1=""
-      label-profile.picture2=""
-      label-profile.picture3=""
+        label-profile.picture1=""
+        label-profile.picture2=""
+        label-profile.picture3=""
 
-      class-profile.picture1="segment margin-bottom-medium third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
-      class-profile.picture2="segment margin-bottom-medium third sm-full padding-right-small padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
-      class-profile.picture3="segment margin-bottom-medium third sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
+        class-profile.picture1="segment margin-bottom-medium third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
+        class-profile.picture2="segment margin-bottom-medium third sm-full padding-right-small padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
+        class-profile.picture3="segment margin-bottom-medium third sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
 
-      submit-button=""
-      submit-widget="button"
+        submit-button=""
+        submit-widget="button"
 
-      data-trans="label-profile.picture1=communities.edit.labelPicture1;label-profile.picture2=communities.edit.labelPicture2;label-profile.picture3=communities.edit.labelPicture3;submit-button=communities.edit.buttonSubmit"
-    )
+        data-trans="label-profile.picture1=communities.edit.labelPicture1;label-profile.picture2=communities.edit.labelPicture2;label-profile.picture3=communities.edit.labelPicture3;submit-button=communities.edit.buttonSubmit"
+      )
 
-    h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans="communities.edit.subTitle1")
+      h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans="communities.edit.subTitle1")
 
-    solid-form.form(
-      bind-resources
-      nested-field="addresses"
-      fields="address_line1, address_line2"
+      solid-form.form(
+        bind-resources
+        nested-field="addresses"
+        fields="address_line1, address_line2"
 
-      label-address_line1=""
-      label-address_line2=""
+        label-address_line1=""
+        label-address_line2=""
 
-      widget-community="solid-form-hidden"
-      widget-address_line1="solid-form-label-text"
-      widget-address_line2="solid-form-label-text"
+        widget-community="solid-form-hidden"
+        widget-address_line1="solid-form-label-text"
+        widget-address_line2="solid-form-label-text"
+        value-address_line1="store://container.@id"
 
-      submit-button=""
-      submit-widget="button"
+        submit-button=""
+        submit-widget="button"
 
-      data-trans="label-addresses.address_line1=communities.edit.labelAddressLine1;label-addresses.address_line2=communities.edit.labelAddressLine2"     
-    )
+        data-trans="label-addresses.address_line1=communities.edit.labelAddressLine1;label-addresses.address_line2=communities.edit.labelAddressLine2"     
+      )
 
-    solid-table.form(
-      selectable
-      header
-      bind-resources
-      nested-fields='addresses'
-      fields='address_line1, address_line2'
-
-      editable-address_line1
-      editable-address_line2
-
-      label-address_line1=''
-      label-address_line2=''
-
-      widget-address_line1='solid-form-label-text'
-      widget-address_line2='solid-form-label-text'
-
-      submit-button=''
-      submit-widget="button"
-      next=`${component.route}-profile`
-
-      data-trans='label-addresses.address_line1=communities.edit.labelAddressLine1;label-addresses.address_line2=communities.edit.labelAddressLine2'     
-    )
-
-    //- solid-ac-checker(no-permission="acl:Write", bind-resources)
-    //-   span(data-trans="communities.edit.noPermission")
+    solid-ac-checker(no-permission="acl:Write", bind-resources)
+      span(data-trans="communities.edit.noPermission")
diff --git a/src/views/partials/widgets/hubl-communities-edit-button.pug b/src/views/partials/widgets/hubl-communities-edit-button.pug
index f05dc5a1caa5689441dfd16076aa4183e7e1da16..f82b3a9bb8bebc4f7b0d6387fb4fdb1e5461438e 100644
--- a/src/views/partials/widgets/hubl-communities-edit-button.pug
+++ b/src/views/partials/widgets/hubl-communities-edit-button.pug
@@ -2,8 +2,9 @@ if componentSet.has('communities') && getRoute('communities')
   solid-widget(name='hubl-communities-edit-button')
     template
       solid-ac-checker(
-        no-permission='acl:Control'
+        permission='acl:Write'
         data-src="${src}"
+        nested-field="profile"
       )
         solid-link(
           class="segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-pencil"
diff --git a/src/views/partials/widgets/hubl-communities-edit-email.pug b/src/views/partials/widgets/hubl-communities-edit-email.pug
index bb778c4a31a621b800e16817921dc890a373dcb8..8ef4268ff5ae7cd3ef84bbf597fc01b1b2c23f86 100644
--- a/src/views/partials/widgets/hubl-communities-edit-email.pug
+++ b/src/views/partials/widgets/hubl-communities-edit-email.pug
@@ -2,4 +2,4 @@ if componentSet.has('communities') && getRoute('communities')
   solid-widget(name='hubl-communities-edit-email')
     template
       label(class="text-small text-semibold text-uppercase text-color-heading" data-trans="communities.edit.labelEmail")
-      input(type="email" label="communities.edit.labelEmail" name="profile.email" required value="\${value}" data-holder)
+      input(type="email" label="communities.edit.labelEmail" name="profile.email" value="\${value}" data-holder)