diff --git a/ember/app/abilities/-base.js b/ember/app/abilities/-base.js
index c7846534e..6f9c462ed 100644
--- a/ember/app/abilities/-base.js
+++ b/ember/app/abilities/-base.js
@@ -28,16 +28,27 @@ export default class BaseAbility extends Ability {
     return this.isStaff || this.isAdmin;
   }
 
-  isOwnIdentity(identity) {
+  isOwnIdentity(idpId) {
     if (!this.session.isAuthenticated) {
       return false;
     }
 
-    return identity.idpId === this.session.data.authenticated.userinfo.sub;
+    return idpId === this.session.data.authenticated.userinfo.sub;
   }
 
-  isStaffOrOwnIdentity(identity) {
-    return this.isStaffOrAdmin || this.isOwnIdentity(identity);
+  canEditIdentity(identity) {
+    if (this.isStaffOrAdmin) {
+      return true;
+    } else if (this.model.isOrganisation) {
+      return this.model.members.any(
+        (member) =>
+          member.authorized &&
+          !member.isInactive &&
+          this.isOwnIdentity(member.identity.get("idpId"))
+      );
+    }
+
+    return this.isOwnIdentity(identity.idpId);
   }
 
   hasAccess(calumaCase) {
diff --git a/ember/app/abilities/additional-email.js b/ember/app/abilities/additional-email.js
index 895fcdc9e..290b7a7e1 100644
--- a/ember/app/abilities/additional-email.js
+++ b/ember/app/abilities/additional-email.js
@@ -6,14 +6,14 @@ export default class AdditionalEmailAbility extends BaseAbility {
   }
 
   canAdd() {
-    return this.isStaffOrOwnIdentity(this.model);
+    return this.canEditIdentity(this.model);
   }
 
   canEdit() {
-    return this.isStaffOrOwnIdentity(this.model);
+    return this.canEditIdentity(this.model);
   }
 
   canDelete() {
-    return this.isStaffOrOwnIdentity(this.model);
+    return this.canEditIdentity(this.model);
   }
 }
diff --git a/ember/app/abilities/address.js b/ember/app/abilities/address.js
index 895fcdc9e..f979ace30 100644
--- a/ember/app/abilities/address.js
+++ b/ember/app/abilities/address.js
@@ -5,15 +5,15 @@ export default class AdditionalEmailAbility extends BaseAbility {
     return this.isStaff;
   }
 
-  canAdd() {
-    return this.isStaffOrOwnIdentity(this.model);
+  get canAdd() {
+    return this.canEditIdentity(this.model);
   }
 
-  canEdit() {
-    return this.isStaffOrOwnIdentity(this.model);
+  get canEdit() {
+    return this.canEditIdentity(this.model);
   }
 
-  canDelete() {
-    return this.isStaffOrOwnIdentity(this.model);
+  get canDelete() {
+    return this.canEditIdentity(this.model);
   }
 }
diff --git a/ember/app/abilities/identity.js b/ember/app/abilities/identity.js
index a9433bc14..9ab76fa73 100644
--- a/ember/app/abilities/identity.js
+++ b/ember/app/abilities/identity.js
@@ -4,20 +4,28 @@ export default class IdentityAbility extends BaseAbility {
   get canList() {
     return this.isStaff;
   }
+
   get canAdd() {
     return this.isStaff;
   }
-  get canEditOrganisation() {
+
+  get canEdit() {
+    return this.canEditIdentity(this.model);
+  }
+
+  get canDelete() {
     return this.isStaff;
   }
-  canAddInterest() {
-    return this.isStaffOrOwnIdentity(this.model);
+
+  get canEditOrganisation() {
+    return this.isStaff;
   }
-  canRemoveInterest() {
-    return this.isStaffOrOwnIdentity(this.model);
+
+  get canAddInterest() {
+    return this.canEditIdentity(this.model);
   }
 
-  canEdit() {
-    return this.isStaffOrOwnIdentity(this.model);
+  get canRemoveInterest() {
+    return this.canEditIdentity(this.model);
   }
 }
diff --git a/ember/app/abilities/phone-number.js b/ember/app/abilities/phone-number.js
index e50469389..81dfc23a3 100644
--- a/ember/app/abilities/phone-number.js
+++ b/ember/app/abilities/phone-number.js
@@ -5,14 +5,14 @@ export default class PhoneNumberAbility extends BaseAbility {
     return this.isStaff;
   }
   canAdd() {
-    return this.isStaffOrOwnIdentity(this.model);
+    return this.canEditIdentity(this.model);
   }
 
   canEdit() {
-    return this.isStaffOrOwnIdentity(this.model);
+    return this.canEditIdentity(this.model);
   }
 
   canDelete() {
-    return this.isStaffOrOwnIdentity(this.model);
+    return this.canEditIdentity(this.model);
   }
 }
diff --git a/ember/app/models/identity.js b/ember/app/models/identity.js
index 486bb2f36..da6f5a6a0 100644
--- a/ember/app/models/identity.js
+++ b/ember/app/models/identity.js
@@ -12,9 +12,6 @@ export default class IdentityModel extends LocalizedModel {
   @attr lastName;
   @attr email;
   @attr language;
-  @hasMany("additional-email") additionalEmails;
-  @hasMany("phone-number") phoneNumbers;
-  @hasMany("interest") interests;
   @attr isOrganisation;
   @attr isExpertAssociation;
   @attr isAdvisoryBoard;
@@ -23,8 +20,14 @@ export default class IdentityModel extends LocalizedModel {
   @attr hasMembers;
   @attr isAuthorized;
 
-  @hasMany("membership") memberships;
-  @hasMany("membership") members;
+  @hasMany("additional-email", { inverse: "identity", async: true })
+  additionalEmails;
+  @hasMany("phone-number", { inverse: "identity", async: true }) phoneNumbers;
+  @hasMany("address", { inverse: "identity", async: true }) address;
+  @hasMany("interest", { async: true }) interests;
+
+  @hasMany("membership", { inverse: "identity", async: true }) memberships;
+  @hasMany("membership", { inverse: "organisation", async: true }) members;
 
   // special attribute from org-memberships endpoint
   @attr roles;
diff --git a/ember/app/models/interest-category.js b/ember/app/models/interest-category.js
index 5526d5cb8..aaf63334f 100644
--- a/ember/app/models/interest-category.js
+++ b/ember/app/models/interest-category.js
@@ -4,7 +4,8 @@ import { localizedAttr, LocalizedModel } from "ember-localized-model";
 export default class InterestCategoryModel extends LocalizedModel {
   @localizedAttr title;
   @attr description;
-  @hasMany interests;
   @attr archived;
   @attr public;
+
+  @hasMany("interest", {inverse: "category", async: true}) interests;
 }
diff --git a/ember/app/models/interest.js b/ember/app/models/interest.js
index 8cddaf6cf..7f79dfa15 100644
--- a/ember/app/models/interest.js
+++ b/ember/app/models/interest.js
@@ -4,6 +4,7 @@ import { localizedAttr, LocalizedModel } from "ember-localized-model";
 export default class InterestModel extends LocalizedModel {
   @localizedAttr title;
   @attr description;
-  @belongsTo("interest-category") category;
   @attr archived;
+  @belongsTo("interest-category", { inverse: "interests", async: true })
+  category;
 }
diff --git a/ember/app/models/membership.js b/ember/app/models/membership.js
index acc92d430..e5a3a1052 100644
--- a/ember/app/models/membership.js
+++ b/ember/app/models/membership.js
@@ -12,9 +12,9 @@ const membershipInactive = (membership) => {
 export { membershipInactive };
 
 export default class MembershipModel extends LocalizedModel {
-  @belongsTo("identity", { inverse: "memberships" }) identity;
-  @belongsTo("identity", { inverse: "members" }) organisation;
-  @belongsTo("membership-role") role;
+  @belongsTo("identity", { inverse: "memberships", async: true }) identity;
+  @belongsTo("identity", { inverse: "members", async: true }) organisation;
+  @belongsTo("membership-role", { async: true }) role;
   @attr authorized;
   @attr timeSlot;
   @attr nextElection;
diff --git a/ember/app/ui/components/identity-form/component.js b/ember/app/ui/components/identity-form/component.js
index 8b8f367e2..ecc08ba7c 100644
--- a/ember/app/ui/components/identity-form/component.js
+++ b/ember/app/ui/components/identity-form/component.js
@@ -119,7 +119,7 @@ export default class IdentityFormComponent extends Component {
       this.args.onSave?.(changeset.data);
 
       if (this.backToIdentities) {
-        this.router.transitionTo("identities");
+        this.router.transitionTo(this.cancelRoute);
       }
     } catch (error) {
       console.error(error);
diff --git a/ember/app/ui/components/identity-form/template.hbs b/ember/app/ui/components/identity-form/template.hbs
index 2345d868e..b15ea50af 100644
--- a/ember/app/ui/components/identity-form/template.hbs
+++ b/ember/app/ui/components/identity-form/template.hbs
@@ -1,9 +1,14 @@
-<div {{did-insert this.onUpdate}} {{did-update this.onUpdate @identity}} class="{{@class}}">
+<div
+  {{did-insert this.onUpdate}}
+  {{did-update this.onUpdate @identity}}
+  class="{{@class}}"
+>
   {{#if this.changeset}}
     <ValidatedForm
       @model={{this.changeset}}
       @on-submit={{perform this.submit}}
-      class="uk-margin-remove-last-child" as |Form|
+      class="uk-margin-remove-last-child"
+      as |Form|
     >
       {{#unless @customEndpoint}}
         <Form.input
@@ -11,8 +16,7 @@
           @type="checkbox"
           @name="isOrganisation"
           @on-update={{this.updateOrganisation}}
-          @disabled={{
-            or
+          @disabled={{or
             this.changeset.hasMembers
             this.changeset.hasMemberships
             (cannot "edit organisation identity" this.changeset.data)
@@ -23,16 +27,24 @@
           <Form.input
             @label={{t "components.identity-form.label.organisationName"}}
             @name="organisationName"
-            @disabled={{or (cannot "edit identity" this.changeset.data) @readOnlyView}}
+            @disabled={{or
+              (cannot "edit identity" this.changeset.data)
+              @readOnlyView
+            }}
           />
 
           <div uk-grid>
             <div>
               <Form.input
-                @label={{t "components.identity-form.label.isExpertAssociation"}}
+                @label={{t
+                  "components.identity-form.label.isExpertAssociation"
+                }}
                 @type="checkbox"
                 @name="isExpertAssociation"
-                @disabled={{or (cannot "edit identity" this.changeset.data) @readOnlyView}}
+                @disabled={{or
+                  (cannot "edit identity" this.changeset.data)
+                  @readOnlyView
+                }}
               />
             </div>
             <div>
@@ -40,7 +52,10 @@
                 @label={{t "components.identity-form.label.isAdvisoryBoard"}}
                 @type="checkbox"
                 @name="isAdvisoryBoard"
-                @disabled={{or (cannot "edit identity" this.changeset.data) @readOnlyView}}
+                @disabled={{or
+                  (cannot "edit identity" this.changeset.data)
+                  @readOnlyView
+                }}
               />
             </div>
           </div>
@@ -51,7 +66,10 @@
         <Form.input
           @label={{t "components.identity-form.label.organisationName"}}
           @name="organisationName"
-          @disabled={{or (cannot "edit identity" this.changeset.data) @readOnlyView}}
+          @disabled={{or
+            (cannot "edit identity" this.changeset.data)
+            @readOnlyView
+          }}
         />
       {{/if}}
       <div class="uk-child-width-expand@s" uk-grid>
@@ -63,7 +81,10 @@
             @options={{this.salutations}}
             @optionLabelPath="label"
             @optionTargetPath="value"
-            @disabled={{or (cannot "edit identity" this.changeset.data) @readOnlyView}}
+            @disabled={{or
+              (cannot "edit identity" this.changeset.data)
+              @readOnlyView
+            }}
           />
         </div>
         <div>
@@ -74,7 +95,10 @@
             @options={{this.titles}}
             @optionLabelPath="label"
             @optionTargetPath="value"
-            @disabled={{or (cannot "edit identity" this.changeset.data) @readOnlyView}}
+            @disabled={{or
+              (cannot "edit identity" this.changeset.data)
+              @readOnlyView
+            }}
           />
         </div>
       </div>
@@ -83,14 +107,20 @@
           <Form.input
             @label={{t "components.identity-form.label.firstName"}}
             @name="firstName"
-            @disabled={{or (cannot "edit identity" this.changeset.data) @readOnlyView}}
+            @disabled={{or
+              (cannot "edit identity" this.changeset.data)
+              @readOnlyView
+            }}
           />
         </div>
         <div>
           <Form.input
             @label={{t "components.identity-form.label.lastName"}}
             @name="lastName"
-            @disabled={{or (cannot "edit identity" this.changeset.data) @readOnlyView}}
+            @disabled={{or
+              (cannot "edit identity" this.changeset.data)
+              @readOnlyView
+            }}
           />
         </div>
       </div>
@@ -103,14 +133,12 @@
         >
           <div class="uk-form-controls">
             <input
-              class="
-              uk-input
-              {{if field.isValid "uk-form-success"}}
-               {{if field.isInvalid "uk-form-danger"}}
-              "
+              class="uk-input
+                {{if field.isValid 'uk-form-success'}}
+                {{if field.isInvalid 'uk-form-danger'}}
+                "
               id="form-email"
-              disabled={{
-                or
+              disabled={{or
                 this.changeset.idpId
                 (cannot "edit identity" this.changeset.data)
                 @readOnlyView
@@ -122,7 +150,11 @@
           </div>
           {{#if this.changeset.idpId}}
             <p class="uk-margin-remove-top">
-              <a href={{this.keyCloakAccountUrl}} target="_blank" rel="noopener noreferrer">
+              <a
+                href={{this.keyCloakAccountUrl}}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
                 {{~t "components.identity-form.hint.email"~}}
               </a>
             </p>
@@ -137,7 +169,10 @@
         @options={{this.languages}}
         @optionLabelPath="label"
         @optionTargetPath="value"
-        @disabled={{or (cannot "edit identity" this.changeset.data) @readOnlyView}}
+        @disabled={{or
+          (cannot "edit identity" this.changeset.data)
+          @readOnlyView
+        }}
       />
 
       {{#if @profileView}}
@@ -147,8 +182,7 @@
             @disabled={{cannot "edit identity" this.changeset.data}}
           />
         </div>
-      {{else if @readOnlyView}}
-      {{else}}
+      {{else if @readOnlyView}}{{else}}
         <Form.input
           @label={{t "components.identity-form.label.comment"}}
           @name="comment"
@@ -157,7 +191,7 @@
 
         <p class="uk-flex uk-flex-between">
           <div>
-            {{#unless this.changeset.isNew}}
+            {{#if (and (not this.changeset.isNew) (can "delete identity"))}}
               <button
                 class="uk-button uk-button-danger"
                 type="button"
@@ -165,11 +199,14 @@
               >
                 {{t "components.identity-form.control.delete"}}
               </button>
-            {{/unless}}
+            {{/if}}
           </div>
 
           <div>
-            <LinkTo class="uk-button uk-button-default" @route={{this.cancelRoute}}>
+            <LinkTo
+              class="uk-button uk-button-default"
+              @route={{this.cancelRoute}}
+            >
               {{t "global.cancel"}}
             </LinkTo>
 
@@ -189,4 +226,4 @@
       {{/if}}
     </ValidatedForm>
   {{/if}}
-</div>
+</div>
\ No newline at end of file
diff --git a/ember/app/ui/components/identity-memberships/template.hbs b/ember/app/ui/components/identity-memberships/template.hbs
index 77aa36769..544933aef 100644
--- a/ember/app/ui/components/identity-memberships/template.hbs
+++ b/ember/app/ui/components/identity-memberships/template.hbs
@@ -11,10 +11,15 @@
     {{#if this.memberships.length}}
       <ul class="uk-list uk-list-divider">
         {{#each this.memberships as |membership|}}
-          <li class="uk-flex uk-flex-between uk-flex-middle">
+          <li class="uk-flex uk-flex-between uk-flex-middle" data-test-membership>
             <div>
               <span class="uk-text-bold {{if membership.isInactive "text-strike-through"}}">
-                {{membership.organisation.organisationName}}
+                <LinkTo
+                  @route="identities.edit"
+                  @model={{membership.organisation}}
+                >
+                  {{membership.organisation.organisationName}}
+                </LinkTo>
                 {{#if membership.authorized}}
                   ({{t "components.identity-memberships.form.label.admin"}})
                 {{/if}}
@@ -68,6 +73,7 @@
                 uk-icon="close"
                 title={{t "components.identity-memberships.list.delete"}}
                 {{on "click" (perform this.delete membership)}}
+                data-test-membership-delete
               ></button>
             </div>
           </li>
@@ -143,6 +149,7 @@
             @onFocus={{this.openPowerSelect}}
             @triggerClass="uk-select"
             @allowClear={{true}}
+            data-test-role-select
             as |opt|
           >
             {{opt.title}}
@@ -232,6 +239,7 @@
 
         <Form.submit
           @label={{t "global.save"}}
+          data-test-membership-save
         />
       </p>
     </ValidatedForm>
diff --git a/ember/app/ui/profile/edit/template.hbs b/ember/app/ui/profile/edit/template.hbs
index 6fd02c8ee..2e45b9ed9 100644
--- a/ember/app/ui/profile/edit/template.hbs
+++ b/ember/app/ui/profile/edit/template.hbs
@@ -4,41 +4,44 @@
   @identity={{@model}}
   @customEndpoint="my-orgs/{{@model.id}}"
   @cancelRouteOverride="profile"
-  @readOnlyView={{true}}
 />
 
-<hr>
+<hr />
 
 <div uk-grid class="uk-margin-bottom">
   <div class="uk-width-1-2@m uk-width-1-3@l">
     <div class="uk-card uk-card-default uk-card-body uk-card-small">
-      <IdentityAddresses @identity={{@model}} @readOnlyView={{true}} />
+      <IdentityAddresses @identity={{@model}} />
     </div>
   </div>
 
   <div class="uk-width-1-2@m uk-width-1-3@l">
     <div class="uk-card uk-card-default uk-card-body uk-card-small">
-      <IdentityEmails @identity={{@model}} @readOnlyView={{true}} />
+      <IdentityEmails @identity={{@model}} />
     </div>
   </div>
 
   <div class="uk-width-1-2@m uk-width-1-3@l">
     <div class="uk-card uk-card-default uk-card-body uk-card-small">
-      <IdentityPhoneNumbers @identity={{@model}} @readOnlyView={{true}} />
+      <IdentityPhoneNumbers @identity={{@model}} />
     </div>
   </div>
 
   <div class="uk-width-1-2@m">
     <div class="uk-card uk-card-default uk-card-body uk-card-small">
-      <IdentityInterests @identity={{@model}} @endpoint={{concat '/my-orgs/' @model.id}} @profileView={{true}} @readOnlyView={{true}} />
+      <IdentityInterests
+        @identity={{@model}}
+        @endpoint={{concat "/my-orgs/" @model.id}}
+        @profileView={{true}}
+      />
     </div>
   </div>
 
   {{#if @model.isAuthorized}}
     <div class="uk-width-1-2@m">
       <div class="uk-card uk-card-default uk-card-body uk-card-small">
-        <IdentityMembers @identity={{@model}} @hideIdentityLink={{true}}/>
+        <IdentityMembers @identity={{@model}} @hideIdentityLink={{true}} />
       </div>
     </div>
   {{/if}}
-</div>
+</div>
\ No newline at end of file
diff --git a/ember/tests/integration/ui/components/identity-memberships/component-test.js b/ember/tests/integration/ui/components/identity-memberships/component-test.js
index 046a30a7c..fd298dd6b 100644
--- a/ember/tests/integration/ui/components/identity-memberships/component-test.js
+++ b/ember/tests/integration/ui/components/identity-memberships/component-test.js
@@ -1,16 +1,70 @@
-import { render } from "@ember/test-helpers";
+import { render, click, fillIn, waitFor } from "@ember/test-helpers";
 import { hbs } from "ember-cli-htmlbars";
 import { setupMirage } from "ember-cli-mirage/test-support";
+import { setupIntl } from "ember-intl/test-support";
+import { selectChoose } from "ember-power-select/test-support";
 import { setupRenderingTest } from "ember-qunit";
+import { authenticateSession } from "ember-simple-auth/test-support";
 import { module, test } from "qunit";
 
 module("Integration | Component | identity-memberships", function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
+  setupIntl(hooks);
+
+  hooks.beforeEach(async function () {
+    await authenticateSession({
+      access_token: "123qweasdyxc",
+      userinfo: { mysagw_groups: ["sagw"] },
+    });
+  });
+
+  test("it adds", async function (assert) {
+    this.identity = this.server.create("identity");
+    const organisation = this.server.create("identity", {
+      isOrganisation: true,
+    });
+    this.server.create("membership-role", {
+      title: {
+        de: "Chef",
+      },
+    });
+
+    await render(hbs`<IdentityMemberships @identity={{this.identity}} />`);
+
+    assert.dom("[data-test-membership]").exists({ count: 0 });
+
+    await click("[data-test-add]");
+    await selectChoose(
+      "[data-test-organisation-select]",
+      organisation.organisationName
+    );
+    await selectChoose("[data-test-role-select]", "Chef");
+
+    await click("[data-test-membership-save]");
+
+    assert.dom("[data-test-membership]").exists({ count: 1 });
+  });
+
+  test("it deletes", async function (assert) {
+    this.identity = this.server.create("identity");
+    const organisation = this.server.create("identity", {
+      isOrganisation: true,
+      organisationName: "SAGW",
+    });
+    this.server.create("membership", {
+      identity: this.identity,
+      organisation,
+    });
 
-  test("it renders", async function (assert) {
-    this.identity = { id: 1 };
     await render(hbs`<IdentityMemberships @identity={{this.identity}} />`);
-    assert.ok(this.element);
+
+    assert.dom("[data-test-membership]").exists({ count: 1 });
+
+    await click("[data-test-membership-delete]");
+    await waitFor(".uk-modal.uk-open");
+    await click(".uk-modal button.uk-button-primary");
+
+    assert.dom("[data-test-membership]").exists({ count: 0 });
   });
 });