diff --git a/src/views/partials/admin/page-admin-circles-create.pug b/src/views/partials/admin/page-admin-circles-create.pug
index 696e627..c5e5f70 100644
--- a/src/views/partials/admin/page-admin-circles-create.pug
+++ b/src/views/partials/admin/page-admin-circles-create.pug
@@ -16,33 +16,34 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
   solid-form.form(
     data-src=`${getComponent('circles').endpoints.post}`
 
-    fields='status, community, name, subtitle, description, help'
+    fields='status, community.community, name, subtitle, description, help'
     required-status
-    required-community
+    required-community.community
     required-name
     required-subtitle
     loader-id=`loader-admin-${getComponent('circles').uniq}`
 
     class-status='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal'
-    class-community='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal'
+    class-community.community='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal'
     class-name='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
     class-subtitle='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
     class-description='segment margin-bottom-xxsmall full text-small text-semibold text-uppercase text-color-heading'
     class-help='segment full text-small margin-bottom-medium padding-left-small'
 
     label-status=''
-    label-community=''
+    label-community.community=''
     label-name=''
     label-subtitle=''
     label-description=''
     label-help=''
 
-    range-community='store://user.communities'
-    option-label-community="community.name"
+    range-community.community='store://user.communities'
+    option-label-community.community="community.name"
+    option-value-community.community="community"
 
     widget-status='solid-form-dropdown-autocompletion-label'
     enum-status=""
-    widget-community='solid-form-dropdown-autocompletion-label'
+    widget-community.community='solid-form-dropdown-autocompletion-label'
     widget-linebreak='solid-form-hidden'
 
     widget-description='solid-form-richtext-label'
@@ -53,5 +54,5 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
     submit-button=''
     submit-widget="button"
 
-    data-trans='enum-status=hublStatus;label-status=circle.create.labelStatus;label-community=circle.create.labelCommunity;label-name=circle.create.labelName;label-description=circle.create.labelDescription;submit-button=circle.create.buttonSubmit;label-subtitle=circle.create.labelSubtitle;label-help=circle.create.descriptionHelp'
+    data-trans='enum-status=hublStatus;label-status=circle.create.labelStatus;label-community.community=circle.create.labelCommunity;label-name=circle.create.labelName;label-description=circle.create.labelDescription;submit-button=circle.create.buttonSubmit;label-subtitle=circle.create.labelSubtitle;label-help=circle.create.descriptionHelp'
   )
diff --git a/src/views/partials/circle/page-circle-edit.pug b/src/views/partials/circle/page-circle-edit.pug
index a7154f0..1e0bfcd 100644
--- a/src/views/partials/circle/page-circle-edit.pug
+++ b/src/views/partials/circle/page-circle-edit.pug
@@ -27,12 +27,12 @@ div.segment.full.padding-large.whitespace-normal
     solid-form.form(
       bind-resources
 
-      fields='name, subtitle, description, status, community, owner'
+      fields='name, subtitle, description, status, community.community, owner'
       required-status
       required-name
       required-owner
       required-subtitle
-      required-community
+      required-community.community
       range-owner=`${component.endpoints.owners}`
 
       label-name=''
@@ -40,14 +40,14 @@ div.segment.full.padding-large.whitespace-normal
       label-description=''
       label-subtitle=''
       label-status=''
-      label-community=''
+      label-community.community=''
       label-help=''
 
       class-name='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
       class-subtitle='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
       class-description='segment margin-bottom-medium full text-small text-semibold text-uppercase text-color-heading'
       class-status='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal'
-      class-community='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal'
+      class-community.community='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal'
       class-owner='hidden'
       class-help='segment full text-small margin-bottom-medium padding-left-small'
 
@@ -55,11 +55,12 @@ div.segment.full.padding-large.whitespace-normal
       enum-status=""
       widget-description='solid-form-richtext-label'
       widget-help='solid-form-hidden-label'
-      widget-community='solid-form-dropdown-autocompletion-label'
+      widget-community.community='solid-form-dropdown-autocompletion-label'
       widget-owner='solid-form-dropdown-autocompletion-label'
 
-      range-community='store://user.communities'
-      option-label-community="community.name"
+      range-community.community='store://user.communities'
+      option-label-community.community="community.name"
+      option-value-community.community="community"
 
       partial=''
 
@@ -67,7 +68,7 @@ div.segment.full.padding-large.whitespace-normal
       submit-widget="button"
       next=`${component.route}-information`
 
-      data-trans='enum-status=hublStatus;label-status=circle.edit.labelStatus;label-community=circle.edit.labelCommunity;label-name=circle.edit.labelName;label-owner=circle.edit.labelOwner;label-description=circle.edit.labelDescription;submit-button=circle.edit.buttonSubmit;label-subtitle=circle.edit.labelSubtitle;label-help=circle.edit.descriptionHelp'
+      data-trans='enum-status=hublStatus;label-status=circle.edit.labelStatus;label-community.community=circle.edit.labelCommunity;label-name=circle.edit.labelName;label-owner=circle.edit.labelOwner;label-description=circle.edit.labelDescription;submit-button=circle.edit.buttonSubmit;label-subtitle=circle.edit.labelSubtitle;label-help=circle.edit.descriptionHelp'
     )
 
   h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='circle.edit.subTitle')