diff --git a/src/apps/Permissions/AppPermissions.js b/src/apps/Permissions/AppPermissions.js
index 3787d9f37..3296ef987 100644
--- a/src/apps/Permissions/AppPermissions.js
+++ b/src/apps/Permissions/AppPermissions.js
@@ -111,7 +111,6 @@ class Row extends React.Component {
     return (
       <LocalIdentityBadge
         entity={entity.type === 'any' ? 'Any account' : entity.address}
-        address={entity.address}
       />
     )
   }
diff --git a/src/apps/Permissions/AppRoles.js b/src/apps/Permissions/AppRoles.js
index 870d7cbd1..8c7efc917 100644
--- a/src/apps/Permissions/AppRoles.js
+++ b/src/apps/Permissions/AppRoles.js
@@ -100,7 +100,6 @@ class RoleRow extends React.Component {
     }
     return (
       <LocalIdentityBadge
-        address={manager.address}
         entity={manager.type === 'burn' ? 'Discarded' : manager.address}
       />
     )
diff --git a/src/apps/Permissions/Home/EntityRow.js b/src/apps/Permissions/Home/EntityRow.js
index 45c72afae..29fc8df2a 100644
--- a/src/apps/Permissions/Home/EntityRow.js
+++ b/src/apps/Permissions/Home/EntityRow.js
@@ -47,9 +47,7 @@ class EntityRow extends React.PureComponent {
     if (entity.type === 'app' && entity.app.name) {
       return <AppInstanceLabel app={entity.app} proxyAddress={entity.address} />
     }
-    return (
-      <LocalIdentityBadge address={entity.address} entity={entity.address} />
-    )
+    return <LocalIdentityBadge entity={entity.address} />
   }
   roleTitle({ role, roleBytes, appEntity, proxyAddress }) {
     if (!appEntity || !appEntity.app) {
diff --git a/src/apps/Permissions/ManageRolePanel.js b/src/apps/Permissions/ManageRolePanel.js
index d474f7091..97b2ab362 100644
--- a/src/apps/Permissions/ManageRolePanel.js
+++ b/src/apps/Permissions/ManageRolePanel.js
@@ -248,7 +248,6 @@ class ManageRolePanel extends React.PureComponent {
     }
     return (
       <LocalIdentityBadge
-        address={manager.address}
         entity={manager.type === 'burn' ? 'Discarded' : manager.address}
       />
     )
diff --git a/src/apps/Permissions/NavigationItem.js b/src/apps/Permissions/NavigationItem.js
index 9f1e91960..b30fc7d89 100644
--- a/src/apps/Permissions/NavigationItem.js
+++ b/src/apps/Permissions/NavigationItem.js
@@ -14,7 +14,6 @@ const NavigationItem = ({ title, badge, address, entity }) => {
           <Title>{title}</Title>
           {above('medium') && isEntity && (
             <LocalIdentityBadge
-              address={address}
               entity={entity && entity.type === 'any' ? 'Any account' : address}
             />
           )}
diff --git a/src/apps/Settings/DaoSettings.js b/src/apps/Settings/DaoSettings.js
index 141e9933a..cd4d60581 100644
--- a/src/apps/Settings/DaoSettings.js
+++ b/src/apps/Settings/DaoSettings.js
@@ -67,7 +67,6 @@ class DaoSettings extends React.PureComponent {
             <Wrap>
               <Label>Address</Label>
               <LocalIdentityBadge
-                address={checksummedDaoAddr}
                 entity={checksummedDaoAddr}
                 shorten={shortAddresses}
               />
@@ -152,7 +151,6 @@ class DaoSettings extends React.PureComponent {
                         {tags.length > 0 ? ` (${tags.join(', ')})` : ''}
                       </Label>
                       <LocalIdentityBadge
-                        address={checksummedProxyAddress}
                         entity={checksummedProxyAddress}
                         shorten={shortAddresses}
                       />
diff --git a/src/components/LocalIdentityBadge/LocalIdentityBadge.js b/src/components/LocalIdentityBadge/LocalIdentityBadge.js
index 5d854bd1d..7bd3ddecd 100644
--- a/src/components/LocalIdentityBadge/LocalIdentityBadge.js
+++ b/src/components/LocalIdentityBadge/LocalIdentityBadge.js
@@ -3,12 +3,18 @@ import PropTypes from 'prop-types'
 import styled from 'styled-components'
 import { Badge, IdentityBadge, font } from '@aragon/ui'
 import { LocalIdentityModalContext } from '../LocalIdentityModal/LocalIdentityModalManager'
+import { isAddress } from '../../web3-utils'
 import {
   IdentityContext,
   identityEventTypes,
 } from '../IdentityManager/IdentityManager'
 
-const LocalIdentityBadge = ({ address, ...props }) => {
+const LocalIdentityBadge = ({ entity, ...props }) => {
+  const address = isAddress(entity) ? entity : null
+  if (address === null) {
+    return <IdentityBadge {...props} customLabel={entity} />
+  }
+
   const { resolve, identityEvents$ } = React.useContext(IdentityContext)
   const { showLocalIdentityModal } = React.useContext(LocalIdentityModalContext)
   const [label, setLabel] = React.useState()
@@ -56,7 +62,7 @@ const LocalIdentityBadge = ({ address, ...props }) => {
     <IdentityBadge
       {...props}
       customLabel={label || ''}
-      address={address}
+      entity={address}
       popoverAction={{
         label: `${label ? 'Edit' : 'Add'} custom label`,
         onClick: handleClick,
@@ -76,7 +82,7 @@ const LocalIdentityBadge = ({ address, ...props }) => {
 }
 
 LocalIdentityBadge.propTypes = {
-  address: PropTypes.string,
+  entity: PropTypes.string,
 }
 
 const Wrap = styled.div`
diff --git a/src/components/LocalIdentityModal/LocalIdentityModal.js b/src/components/LocalIdentityModal/LocalIdentityModal.js
index ecacabaee..38d7f3dc8 100644
--- a/src/components/LocalIdentityModal/LocalIdentityModal.js
+++ b/src/components/LocalIdentityModal/LocalIdentityModal.js
@@ -14,12 +14,9 @@ import EscapeOutside from '../EscapeOutside/EscapeOutside'
 
 const LocalIdentityModal = ({ opened, ...props }) => {
   const { showModal, hideModal } = React.useContext(ModalContext)
-  React.useEffect(
-    () => {
-      opened ? showModal(Modal, props) : hideModal()
-    },
-    [opened]
-  )
+  React.useEffect(() => {
+    opened ? showModal(Modal, props) : hideModal()
+  }, [opened])
 
   return null
 }
diff --git a/src/components/SignerPanel/ActionPathsContent.js b/src/components/SignerPanel/ActionPathsContent.js
index e6da0fedb..c9a64d966 100644
--- a/src/components/SignerPanel/ActionPathsContent.js
+++ b/src/components/SignerPanel/ActionPathsContent.js
@@ -58,7 +58,6 @@ class ActionPathsContent extends React.Component {
                       `}
                     >
                       <LocalIdentityBadge
-                        address={value}
                         entity={type === 'any-account' ? 'Any account' : value}
                         fontSize="small"
                       />