diff --git a/src/base/orgs/CreateOrg.svelte b/src/base/orgs/CreateOrg.svelte
index 338dfad16..7f3759c3c 100644
--- a/src/base/orgs/CreateOrg.svelte
+++ b/src/base/orgs/CreateOrg.svelte
@@ -62,7 +62,7 @@
       {#if org}
         <table>
           <tr><td class="label">Address</td><td>{org.address}</td></tr>
-          <tr><td class="label">Safe</td><td>{org.safe}</td></tr>
+          <tr><td class="label">Owner</td><td>{org.safe}</td></tr>
         </table>
       {:else}
         <table>
diff --git a/src/base/orgs/Org.ts b/src/base/orgs/Org.ts
index c288a8c7a..d3d44ffc4 100644
--- a/src/base/orgs/Org.ts
+++ b/src/base/orgs/Org.ts
@@ -48,10 +48,10 @@ export class Org {
       orgAbi,
       config.provider
     );
-    const resolved = await org.resolvedAddress;
 
     try {
-      let safe = await org.owner();
+      const safe = await org.owner();
+      const resolved = await org.resolvedAddress;
       return new Org(resolved, safe);
     } catch (e) {
       console.error(e);
diff --git a/src/base/orgs/Profile.svelte b/src/base/orgs/Profile.svelte
index 44685922e..51a5fb0bc 100644
--- a/src/base/orgs/Profile.svelte
+++ b/src/base/orgs/Profile.svelte
@@ -5,15 +5,12 @@
   import { Org } from './Org';
   import Loading from '@app/Loading.svelte';
   import Modal from '@app/Modal.svelte';
+  import Error from '@app/Error.svelte';
 
-  export let id: string;
+  export let name: string;
   export let config: Config;
 
-  let address: string;
-
-  if (! ethers.utils.isAddress(id)) {
-    address = `${id}.${config.registrar.domain}`;
-  }
+  let address = `${name}.${config.registrar.domain}`;
 
   const back = () => {
     navigate("/orgs");
@@ -69,5 +66,5 @@
     </Modal>
   {/if}
 {:catch err}
-  {err}
+  <Error error={err} />
 {/await}
diff --git a/src/base/orgs/Routes.svelte b/src/base/orgs/Routes.svelte
index 9940c6669..8189d45dc 100644
--- a/src/base/orgs/Routes.svelte
+++ b/src/base/orgs/Routes.svelte
@@ -11,6 +11,6 @@
   <Orgs {config} />
 </Route>
 
-<Route path="/orgs/:id" let:params>
-  <Profile {config} id={params.id} />
+<Route path="/orgs/:name" let:params>
+  <Profile {config} name={params.name} />
 </Route>