diff --git a/package-lock.json b/package-lock.json
index b08d84816..bd71f65dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "business-create-ui",
-  "version": "4.0.14",
+  "version": "4.0.15",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "business-create-ui",
-      "version": "4.0.14",
+      "version": "4.0.15",
       "dependencies": {
         "@babel/compat-data": "^7.11.0",
         "@bcrs-shared-components/bread-crumb": "1.0.2",
diff --git a/package.json b/package.json
index edc491847..ca4950e5f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "4.0.14",
+  "version": "4.0.15",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",
diff --git a/src/components/Registration/BusinessLookup.vue b/src/components/Registration/BusinessLookup.vue
index dc6675bb8..9cf5b7190 100644
--- a/src/components/Registration/BusinessLookup.vue
+++ b/src/components/Registration/BusinessLookup.vue
@@ -7,6 +7,7 @@
         autocomplete="chrome-off"
         class="mt-5"
         append-icon=""
+        menu-props="{ maxHeight: 380 }"
         :name="Math.random()"
         :rules="showErrors ? businessLookupRules: []"
         :items="searchResults"
@@ -26,7 +27,7 @@
           </v-list-item>
         </template>
         <template v-slot:item="{ item }">
-          <v-row class="business-lookup-result">
+          <v-row class="business-lookup-result pt-1">
             <v-col cols="2">
               <div class="result-identifier">{{item.identifier}}</div>
             </v-col>
@@ -39,56 +40,34 @@
       </v-autocomplete>
     </div>
 
-    <div v-if="state === States.SUMMARY && haveBusiness"
-      class="summary-block d-flex justify-space-between align-center">
+    <div v-if="state === States.SUMMARY && haveBusiness" class="summary-block mt-5">
       <v-row no-gutters>
         <v-col cols="9">
           <v-row no-gutters>
-            <v-col cols="12" sm="3">
-              <label>Name</label>
-            </v-col>
-            <v-col cols="12" sm="9">
+            <v-col cols="12">
+              <label>Name: </label>
               <span>{{businessName}}</span>
             </v-col>
           </v-row>
-          <v-row no-gutters>
-            <v-col cols="12" sm="3">
-              <label>Incorporation Number</label>
-            </v-col>
-            <v-col cols="12" sm="9">
+          <v-row no-gutters class="mt-1">
+            <v-col cols="12">
+              <label>Incorporation Number: </label>
               <span>{{identifier}}</span>
             </v-col>
           </v-row>
-          <v-row no-gutters>
-            <v-col cols="12" sm="3">
-              <label>Business Number</label>
-            </v-col>
-            <v-col cols="12" sm="9">
+          <v-row no-gutters class="mt-1">
+            <v-col cols="12">
+              <label>Business Number: </label>
               <span>{{businessNumber}}</span>
             </v-col>
           </v-row>
         </v-col>
         <v-col cols="3">
-          <v-btn v-if="!hasBusinessLookupChanges" text color="primary" id="bl-change-btn" @click="onChangeClicked()">
-            <v-icon small>mdi-pencil</v-icon>
-            <span>Change</span>
-          </v-btn>
-
-          <div v-else id="bl-more-actions">
+          <div id="bl-more-actions">
             <v-btn text color="primary" id="bl-undo-btn" @click="emitUndo()">
               <v-icon small>mdi-undo</v-icon>
               <span>Undo</span>
             </v-btn>
-            <v-menu offset-y left nudge-bottom="4" v-model="dropdown">
-              <template v-slot:activator="{ on }">
-                <v-btn text small color="primary" id="bl-menu-btn" v-on="on">
-                  <v-icon>{{dropdown ? 'mdi-menu-up' : 'mdi-menu-down'}}</v-icon>
-                </v-btn>
-              </template>
-              <v-btn text color="primary" id="bl-more-changes-btn" class="py-5"
-                @click="onChangeClicked(); dropdown = false">
-                <v-icon small color="primary">mdi-pencil</v-icon>Change</v-btn>
-            </v-menu>
           </div>
         </v-col>
       </v-row>
@@ -129,6 +108,7 @@ export default class BusinessLookup extends Vue {
 
   // enum for template
   readonly States = States
+
   // local variables
   private state = States.INITIAL
 
@@ -136,8 +116,6 @@ export default class BusinessLookup extends Vue {
   private searchResults: Array<BusinessLookupResultIF> = []
   private selectedBusiness: BusinessLookupResultIF = null
 
-  /** V-model for dropdown menu. */
-  private dropdown: boolean = null
   /** The text field validation rules. */
   readonly businessLookupRules: Array<Function> = [
     v => !!v || 'Business is required'
@@ -162,6 +140,7 @@ export default class BusinessLookup extends Vue {
   get isFormValid (): boolean {
     return (this.haveBusiness && this.state === States.SUMMARY)
   }
+
   /** Called when searchField property has changed. */
   @Watch('searchField')
   @Debounce(600)
@@ -188,20 +167,10 @@ export default class BusinessLookup extends Vue {
         name: result.name,
         bn: result.bn
       })
+      this.selectedBusiness = null
     }
   }
-  /** Called when user has clicked the Cancel button. */
-  protected onCancelClicked (): void {
-    // if we have stored business data then display summary
-    // otherwise go back to INITIAL state
-    this.state = this.haveBusiness ? States.SUMMARY : States.INITIAL
-  }
-  /** Called when user has clicked the Change button. */
-  protected onChangeClicked (): void {
-    // set search to current identifier
-    this.searchField = this.identifier
-    this.state = States.INITIAL
-  }
+
   /** Called when haveBusiness property (which is based on this component's props) has changed. */
   @Watch('haveBusiness', { immediate: true })
   private onHaveBusinessChanged (val: boolean): void {
@@ -243,24 +212,19 @@ export default class BusinessLookup extends Vue {
   cursor: pointer;
   font-size: $px-16;
 }
-#bl-change-btn {
-  margin-right: -14px;
-}
 #bl-more-actions {
   margin-right: -14px;
   white-space: nowrap;
   #bl-undo-btn {
     min-width: unset;
-    border-right: 1px solid $gray1;
+    float: right;
   }
 }
-#result-list {
-  background-color: $gray1;
-  max-height: 650px;
-  overflow-y: auto;
-}
 .summary-block {
-  margin-top: -6px; // compensate for Change button pushing this col down
+  label {
+    font-weight: bold;
+    color: $gray9;
+  }
 }
 // Veutify overrides
 ::v-deep {
diff --git a/src/components/Registration/RegAddEditOrgPerson.vue b/src/components/Registration/RegAddEditOrgPerson.vue
index 56208aeb6..6197c5d1d 100644
--- a/src/components/Registration/RegAddEditOrgPerson.vue
+++ b/src/components/Registration/RegAddEditOrgPerson.vue
@@ -88,11 +88,11 @@
             <!-- Business or Corporation -->
             <template v-if="isOrg">
               <!-- Business or Corporation Unregistered in B.C. -->
-              <article v-if="isManualAdd" class="manual-add-article">
+              <article v-if="!orgPerson.isLookupBusiness" class="manual-add-article">
                 <label>
                   {{ isNaN(activeIndex) ? 'Add' : ' Edit' }} Business or Corporation Unregistered in B.C.
                 </label>
-                <a class="lookup-toggle float-right" @click="isManualAdd = false">
+                <a class="lookup-toggle float-right" @click="swapIsLookupBusiness()">
                   Business or Corporation Look Up
                 </a>
 
@@ -149,30 +149,59 @@
               <!-- Business or Corporation Look up -->
               <article v-else class="business-lookup-article">
                 <label>Business or Corporation Look up</label>
-                <a class="lookup-toggle float-right" @click="isManualAdd = true">
+                <a class="lookup-toggle float-right" @click="swapIsLookupBusiness()">
                   Business or Corporation is Unregistered in B.C.
                 </a>
-
-                <p class="mt-6 mb-0">
-                  To add a registered B.C. business or corporation as
-                  {{ isProprietor ? 'the Proprietor' : 'a partner' }}, enter the name or
-                  incorporation number.
-                </p>
-
-                <p class="mt-6 mb-0">
-                  If you are adding a company that is not legally required to register in B.C. such as
-                  a bank or a railway, use the manual entry form. All other types of business cannot
-                  be {{ isProprietor ? 'the Proprietor' : 'a partner' }}.
-                </p>
-
-                <HelpContactUs class="mt-6" />
+                <div class="mt-6" v-if="hasBusinessSelectedFromLookup">
+                  <v-card
+                    outlined class="message-box rounded-0"
+                  >
+                    <p>
+                      <strong>Important:</strong> If the addresses shown below are out of date, you
+                      may update them here. The updates are applicable only to this registration.
+                    </p>
+                  </v-card>
+                </div>
+                <div v-else>
+                  <p class="mt-6 mb-0">
+                    To add a registered B.C. business or corporation as
+                    {{ isProprietor ? 'the Proprietor' : 'a partner' }}, enter the name or
+                    incorporation number.
+                  </p>
+                  <p class="mt-6 mb-0">
+                    If you are adding a company that is not legally required to register in B.C. such as
+                    a bank or a railway, use the manual entry form. All other types of business cannot
+                    be {{ isProprietor ? 'the Proprietor' : 'a partner' }}.
+                  </p>
+                  <HelpContactUs class="mt-6" />
+                </div>
 
                 <BusinessLookup
-                  :showErrors="false"
-                  :businessLookup="EmptyBusinessLookup"
+                  :showErrors="enableRules"
+                  :businessLookup="inProgressBusinessLookup"
                   :BusinessLookupServices="BusinessLookupServices"
-                  :hasBusinessLookupChanges="true"
+                  @setBusiness="updateBusinessDetails($event)"
+                  @undoBusiness="resetBusinessDetails($event)"
                 />
+                <div v-if="isProprietor && orgPerson.showOptionalBN">
+                  <p class="mt-4 mb-0">
+                    If an existing business number for this business or corporation is available,
+                    enter it below. We will contact the Canada Revenue Agency and ask them to link it to
+                    this registration.
+                  </p>
+                  <HelpBusinessNumber class="mt-4" />
+                  <!-- Business Number (org proprietors only) -->
+                  <v-text-field
+                    filled
+                    persistent-hint
+                    class="item business-number mt-8 mb-n2"
+                    label="Business Number (Optional)"
+                    hint="First 9 digits of the CRA Business Number"
+                    v-model="orgPerson.officer.businessNumber"
+                    v-mask="['#########']"
+                    :rules="enableRules ? Rules.BusinessNumberRules : []"
+                  />
+                </div>
               </article>
             </template>
 
@@ -331,7 +360,6 @@ import HelpBusinessNumber from '@/components/Registration/HelpBusinessNumber.vue
 import HelpContactUs from '@/components/Registration/HelpContactUs.vue'
 import { AddEditOrgPersonMixin } from '@/mixins'
 import { Rules } from '@/rules'
-import { EmptyBusinessLookup } from '@/interfaces'
 import { BusinessLookupServices } from '@/services'
 
 /** This is a sub-component of PeopleAndRoles. */
@@ -351,9 +379,6 @@ export default class RegAddEditOrgPerson extends Mixins(AddEditOrgPersonMixin) {
   // NB: see mixin for common properties, methods, etc.
   //
 
-  // local property
-  protected isManualAdd = false
-
   /** The validation rules for the Organization Name. */
   readonly OrgNameRules: Array<Function> = [
     v => !!v?.trim() || 'Business or corporation name is required',
@@ -362,8 +387,8 @@ export default class RegAddEditOrgPerson extends Mixins(AddEditOrgPersonMixin) {
 
   // Rules for template
   readonly Rules = Rules
+
   readonly BusinessLookupServices = BusinessLookupServices
-  readonly EmptyBusinessLookup = EmptyBusinessLookup
 }
 </script>
 
diff --git a/src/components/Registration/RegPeopleAndRoles.vue b/src/components/Registration/RegPeopleAndRoles.vue
index bd0ed0be3..41a9e3472 100644
--- a/src/components/Registration/RegPeopleAndRoles.vue
+++ b/src/components/Registration/RegPeopleAndRoles.vue
@@ -236,6 +236,11 @@ export default class RegPeopleAndRoles extends Mixins(PeopleRolesMixin) {
       this.currentOrgPerson.deliveryAddress = cloneDeep(this.currentOrgPerson.mailingAddress)
     }
 
+    if (isOrganization) {
+      this.currentOrgPerson.isLookupBusiness = true
+      this.currentOrgPerson.showOptionalBN = false
+    }
+
     this.activeIndex = NaN // new org/person
     this.showOrgPersonForm = true
   }
diff --git a/src/interfaces/stepper-interfaces/AddPeopleAndRole/org-person-interface.ts b/src/interfaces/stepper-interfaces/AddPeopleAndRole/org-person-interface.ts
index e5f97ba9d..6d7b874d3 100644
--- a/src/interfaces/stepper-interfaces/AddPeopleAndRole/org-person-interface.ts
+++ b/src/interfaces/stepper-interfaces/AddPeopleAndRole/org-person-interface.ts
@@ -10,6 +10,7 @@ export interface OfficerIF {
   organizationName: string
   email?: string
   businessNumber?: string // SP proprietors and GP partners only
+  identifier?: string // SP proprietors and GP partners only
 }
 
 export interface OrgPersonIF {
@@ -19,6 +20,8 @@ export interface OrgPersonIF {
   deliveryAddress?: AddressIF
   inheritMailingAddress?: boolean // for UI use only
   confirmBusiness?: boolean // SP proprietors and GP partners only // for UI use only
+  isLookupBusiness?: boolean // SP proprietors and GP partners only // for UI use only
+  showOptionalBN?: boolean // SP proprietors and GP partners only // for UI use only
 }
 
 export const EmptyOfficer: OfficerIF = {
diff --git a/src/mixins/add-edit-org-person-mixin.ts b/src/mixins/add-edit-org-person-mixin.ts
index a44972fc7..33fcbbf55 100644
--- a/src/mixins/add-edit-org-person-mixin.ts
+++ b/src/mixins/add-edit-org-person-mixin.ts
@@ -3,10 +3,20 @@ import { Action, Getter } from 'vuex-class'
 import { cloneDeep, isEqual } from 'lodash'
 import { v4 as uuidv4 } from 'uuid'
 import { CorpTypeCd, PartyTypes, RoleTypes } from '@/enums'
-import { ActionBindingIF, AddressIF, ConfirmDialogType, EmptyAddress, FormIF, OrgPersonIF,
-  PeopleAndRolesResourceIF, RolesIF } from '@/interfaces'
+import {
+  ActionBindingIF,
+  AddressIF,
+  BusinessLookupIF,
+  ConfirmDialogType,
+  EmptyAddress,
+  EmptyBusinessLookup,
+  FormIF,
+  OrgPersonIF,
+  PeopleAndRolesResourceIF,
+  RolesIF } from '@/interfaces'
 import { Rules } from '@/rules'
 import { PersonAddressSchema } from '@/schemas'
+import { LegalServices } from '@/services'
 
 /**
  * Mixin that provides common add/edit org/person methods.
@@ -42,9 +52,11 @@ export default class AddEditOrgPersonMixin extends Vue {
   private addPersonOrgFormValid = true
   private enableRules = false
 
+  private inProgressBusinessLookup: BusinessLookupIF = EmptyBusinessLookup
+
   // Address related properties
-  private inProgressMailingAddress: AddressIF
-  private inProgressDeliveryAddress: AddressIF
+  private inProgressMailingAddress = {} as AddressIF
+  private inProgressDeliveryAddress = {} as AddressIF
   private inheritMailingAddress = true
   private mailingAddressValid = false
   private deliveryAddressValid = false
@@ -102,6 +114,11 @@ export default class AddEditOrgPersonMixin extends Vue {
     return (this.orgPerson.officer?.partyType === PartyTypes.ORGANIZATION)
   }
 
+  /** Whether current business object is selected using lookup. */
+  protected get hasBusinessSelectedFromLookup (): boolean {
+    return this.orgPerson?.isLookupBusiness && !!this.inProgressBusinessLookup.identifier
+  }
+
   /** Whether the Completing Party role should be shown. */
   protected get showCompletingPartyRole (): boolean {
     const isRoleCompletingParty = this.orgPerson.roles.some(role => role.roleType === RoleTypes.COMPLETING_PARTY)
@@ -185,6 +202,14 @@ export default class AddEditOrgPersonMixin extends Vue {
         // initialize inheritMailingAddress checkbox
         this.updateSameAsMailingChkBox()
       }
+
+      if (this.initialValue.isLookupBusiness) {
+        this.inProgressBusinessLookup = {
+          name: this.initialValue.officer.organizationName,
+          identifier: this.initialValue.officer.identifier,
+          bn: this.initialValue.officer.businessNumber
+        }
+      }
     }
 
     // if editing, enable validation from the start
@@ -259,6 +284,42 @@ export default class AddEditOrgPersonMixin extends Vue {
     this.$refs.addPersonOrgForm && this.$refs.addPersonOrgForm.validate()
   }
 
+  protected swapIsLookupBusiness (): void {
+    this.orgPerson.isLookupBusiness = !this.orgPerson?.isLookupBusiness
+  }
+
+  /**
+   * BusinessLookup component event handler - called when it is rendered and when
+   * the user undo selected business.
+   */
+  protected resetBusinessDetails (): void {
+    this.updateBusinessDetails(EmptyBusinessLookup)
+  }
+
+  /**
+   * BusinessLookup component event handler - called when it is rendered and when
+   * the user has selected a business.
+   */
+  protected async updateBusinessDetails (businessLookup: BusinessLookupIF): Promise<void> {
+    this.orgPerson.officer.organizationName = businessLookup.name
+    this.orgPerson.officer.identifier = businessLookup.identifier
+    businessLookup.bn = businessLookup.bn?.length > 9
+      ? businessLookup.bn.slice(0, 9)
+      : businessLookup.bn
+    this.orgPerson.officer.businessNumber = businessLookup.bn
+    this.orgPerson.showOptionalBN = !businessLookup.bn
+
+    this.inProgressBusinessLookup = { ...businessLookup }
+    if (businessLookup.identifier) {
+      const addresses = await LegalServices.fetchAddresses(businessLookup.identifier)
+      const registeredOffice = addresses?.registeredOffice
+      if (registeredOffice) {
+        this.inProgressMailingAddress = { ...registeredOffice.mailingAddress }
+        this.inProgressDeliveryAddress = { ...registeredOffice.deliveryAddress }
+      }
+    }
+  }
+
   protected async assignCompletingPartyRole (): Promise<void> {
     if (
       this.orgPerson &&
diff --git a/src/services/legal.services.ts b/src/services/legal.services.ts
index e47ec1c6c..ddd0aaafb 100644
--- a/src/services/legal.services.ts
+++ b/src/services/legal.services.ts
@@ -139,6 +139,27 @@ export default class LegalServices {
     })
   }
 
+  /**
+   * Fetches addresses.
+   * @param businessId the business identifier (aka entity inc no)
+   * @returns a promise to return the addresses from the response
+   */
+  static fetchAddresses (businessId: string): Promise<any> {
+    const url = `businesses/${businessId}/addresses`
+    return axios.get(url).then(response => {
+      const data = response?.data
+      if (!data) {
+        throw new Error('Invalid API response')
+      }
+      return data
+    }).catch(error => {
+      if (error?.response?.status === NOT_FOUND) {
+        return null // Business or Address not found
+      }
+      throw error
+    })
+  }
+
   /**
     * Ensure consistent object structure for an incorporation application,
     * whether it contains a Name Request or not, and whether it is an initial
diff --git a/tests/unit/BusinessLookup.spec.ts b/tests/unit/BusinessLookup.spec.ts
index 41c3cc215..4093b391e 100644
--- a/tests/unit/BusinessLookup.spec.ts
+++ b/tests/unit/BusinessLookup.spec.ts
@@ -31,11 +31,14 @@ describe('Business Lookup component', () => {
     expect(wrapper.find('#business-lookup').exists()).toBe(true)
   })
 
-  // it('renders the undo action when prompted', async () => {
-  //   wrapper.vm.state = 'summary'
-  //   wrapper.setProps({ hasBusinessLookupChanges: true })
-  //   await Vue.nextTick()
+  it('renders the undo action when prompted', async () => {
+    wrapper.vm.state = 'summary'
+    wrapper.setProps({ businessLookup: {
+      identifier: 'BC1234567',
+      name: 'test business name'
+    } })
+    await Vue.nextTick()
 
-  //   expect(wrapper.find('#bl-undo-btn').exists()).toBe(true)
-  // })
+    expect(wrapper.find('#bl-undo-btn').exists()).toBe(true)
+  })
 })
diff --git a/tests/unit/RegAddEditOrgPerson.spec.ts b/tests/unit/RegAddEditOrgPerson.spec.ts
index 525f3220b..22aa74009 100644
--- a/tests/unit/RegAddEditOrgPerson.spec.ts
+++ b/tests/unit/RegAddEditOrgPerson.spec.ts
@@ -122,7 +122,8 @@ const validProprietorOrg = {
     postalCode: 'V8Z 5C6',
     addressCountry: 'CA'
   },
-  confirmBusiness: true
+  confirmBusiness: true,
+  isLookupBusiness: true
 }
 
 const validPartnerPerson = {
@@ -187,7 +188,8 @@ const validPartnerOrg = {
     postalCode: 'V8Z 5C6',
     addressCountry: 'CA'
   },
-  confirmBusiness: true
+  confirmBusiness: true,
+  isLookupBusiness: true
 }
 
 /**