diff --git a/app/services/uprn_data_presenter.rb b/app/services/uprn_data_presenter.rb
index 5602cbd28..7c70a81e3 100644
--- a/app/services/uprn_data_presenter.rb
+++ b/app/services/uprn_data_presenter.rb
@@ -8,22 +8,35 @@ class UprnDataPresenter
   end
 
   def postcode
-    data["POSTCODE"]
+    result_from_lpi? ? data["POSTCODE_LOCATOR"] : data["POSTCODE"]
   end
 
   def address_line1
-    data.values_at(
-      "PO_BOX_NUMBER",
-      "ORGANISATION_NAME",
-      "DEPARTMENT_NAME",
-      "SUB_BUILDING_NAME",
-      "BUILDING_NAME",
-      "BUILDING_NUMBER",
-      "DEPENDENT_THOROUGHFARE_NAME",
-      "THOROUGHFARE_NAME",
-    ).compact
-     .join(", ")
-     .titleize
+    if result_from_lpi?
+      data.values_at(
+        "ORGANISATION",
+        "SAO_TEXT",
+        "PAO_START_NUMBER",
+        "STREET_DESCRIPTION",
+        "LOCALITY_NAME",
+        "ADMINISTRATIVE_AREA",
+      ).compact
+       .join(", ")
+       .titleize
+    else
+      data.values_at(
+        "PO_BOX_NUMBER",
+        "ORGANISATION_NAME",
+        "DEPARTMENT_NAME",
+        "SUB_BUILDING_NAME",
+        "BUILDING_NAME",
+        "BUILDING_NUMBER",
+        "DEPENDENT_THOROUGHFARE_NAME",
+        "THOROUGHFARE_NAME",
+      ).compact
+       .join(", ")
+       .titleize
+    end
   end
 
   def address_line2
@@ -36,6 +49,10 @@ class UprnDataPresenter
   end
 
   def town_or_city
-    data["POST_TOWN"].titleize
+    result_from_lpi? ? data["TOWN_NAME"].titleize : data["POST_TOWN"].titleize
+  end
+
+  def result_from_lpi?
+    data["LPI_KEY"].present?
   end
 end
diff --git a/spec/services/uprn_client_spec.rb b/spec/services/uprn_client_spec.rb
index e329f9948..3189c455b 100644
--- a/spec/services/uprn_client_spec.rb
+++ b/spec/services/uprn_client_spec.rb
@@ -40,7 +40,7 @@ describe UprnClient do
     context "when DPA results empty" do
       context "and LPI result is present" do
         let(:valid_lpi_response) do
-          { results: [{ LPI: { postcode: "LPI postcode" } }] }.to_json
+          { results: [{ LPI: { postcode_locator: "LPI postcode", LPI_KEY: "123" } }] }.to_json
         end
 
         before do
@@ -50,7 +50,7 @@ describe UprnClient do
         end
 
         it "returns result" do
-          expect(client.result).to eq({ "postcode" => "LPI postcode" })
+          expect(client.result).to eq({ "postcode_locator" => "LPI postcode", "LPI_KEY" => "123" })
         end
 
         it "returns no error" do
diff --git a/spec/services/uprn_data_presenter_spec.rb b/spec/services/uprn_data_presenter_spec.rb
index 16ae9318f..d7d5549b4 100644
--- a/spec/services/uprn_data_presenter_spec.rb
+++ b/spec/services/uprn_data_presenter_spec.rb
@@ -1,66 +1,109 @@
 require "rails_helper"
 
 describe UprnDataPresenter do
-  let(:data) do
-    JSON.parse(
-      '{
-        "UPRN": "UPRN",
-        "UDPRN": "UDPRN",
-        "ADDRESS": "full address",
-        "SUB_BUILDING_NAME": "0",
-        "BUILDING_NAME": "building name",
-        "THOROUGHFARE_NAME": "thoroughfare",
-        "POST_TOWN": "posttown",
-        "POSTCODE": "postcode",
-        "STATUS": "APPROVED",
-        "DOUBLE_DEPENDENT_LOCALITY": "double dependent locality",
-        "DEPENDENT_LOCALITY": "dependent locality",
-        "CLASSIFICATION_CODE": "classification code",
-        "LOCAL_CUSTODIAN_CODE_DESCRIPTION": "LONDON BOROUGH OF HARINGEY",
-        "BLPU_STATE_CODE": "2",
-        "BLPU_STATE_CODE_DESCRIPTION": "In use",
-        "LAST_UPDATE_DATE": "31/07/2020",
-        "ENTRY_DATE": "30/01/2015",
-        "BLPU_STATE_DATE": "30/01/2015",
-        "LANGUAGE": "EN",
-        "MATCH_DESCRIPTION": "EXACT"
-      }',
-    )
-  end
-
   let(:presenter) { described_class.new(data) }
 
-  describe "#postcode" do
-    it "returns postcode" do
-      expect(presenter.postcode).to eq("postcode")
+  describe "DPA data" do
+    let(:data) do
+      JSON.parse(
+        '{
+          "UPRN": "UPRN",
+          "UDPRN": "UDPRN",
+          "ADDRESS": "full address",
+          "SUB_BUILDING_NAME": "0",
+          "BUILDING_NAME": "building name",
+          "THOROUGHFARE_NAME": "thoroughfare",
+          "POST_TOWN": "posttown",
+          "POSTCODE": "postcode",
+          "STATUS": "APPROVED",
+          "DOUBLE_DEPENDENT_LOCALITY": "double dependent locality",
+          "DEPENDENT_LOCALITY": "dependent locality",
+          "CLASSIFICATION_CODE": "classification code",
+          "LOCAL_CUSTODIAN_CODE_DESCRIPTION": "LONDON BOROUGH OF HARINGEY",
+          "BLPU_STATE_CODE": "2",
+          "BLPU_STATE_CODE_DESCRIPTION": "In use",
+          "LAST_UPDATE_DATE": "31/07/2020",
+          "ENTRY_DATE": "30/01/2015",
+          "BLPU_STATE_DATE": "30/01/2015",
+          "LANGUAGE": "EN",
+          "MATCH_DESCRIPTION": "EXACT"
+        }',
+      )
     end
-  end
 
-  describe "#address_line1" do
-    it "returns address_line1" do
-      expect(presenter.address_line1).to eq("0, Building Name, Thoroughfare")
+    describe "#postcode" do
+      it "returns postcode" do
+        expect(presenter.postcode).to eq("postcode")
+      end
     end
-  end
 
-  describe "#address_line2" do
-    it "returns address_line2" do
-      expect(presenter.address_line2).to eq("Double Dependent Locality, Dependent Locality")
+    describe "#address_line1" do
+      it "returns address_line1" do
+        expect(presenter.address_line1).to eq("0, Building Name, Thoroughfare")
+      end
     end
-  end
 
-  describe "#town_or_city" do
-    it "returns town_or_city" do
-      expect(presenter.town_or_city).to eq("Posttown")
+    describe "#address_line2" do
+      it "returns address_line2" do
+        expect(presenter.address_line2).to eq("Double Dependent Locality, Dependent Locality")
+      end
+    end
+
+    describe "#town_or_city" do
+      it "returns town_or_city" do
+        expect(presenter.town_or_city).to eq("Posttown")
+      end
+    end
+
+    context "when address_line2 fields are missing" do
+      let(:data) { {} }
+
+      describe "#address_line2" do
+        it "returns nil" do
+          expect(presenter.address_line2).to be_nil
+        end
+      end
     end
   end
 
-  context "when address_line2 fields are missing" do
-    let(:data) { {} }
+  describe "LPI data" do
+    let(:data) do
+      JSON.parse(
+        '{
+          "UPRN": "UPRN",
+          "ADDRESS": "flat 1, 22, street name, posttown, postcode",
+          "SAO_TEXT": "flat 1",
+          "PAO_START_NUMBER": "22",
+          "STREET_DESCRIPTION": "street name",
+          "TOWN_NAME": "posttown",
+          "POSTCODE_LOCATOR": "postcode",
+          "LPI_KEY": "LPI_KEY"
+        }',
+      )
+    end
+
+    describe "#postcode" do
+      it "returns postcode" do
+        expect(presenter.postcode).to eq("postcode")
+      end
+    end
+
+    describe "#address_line1" do
+      it "returns address_line1" do
+        expect(presenter.address_line1).to eq("Flat 1, 22, Street Name")
+      end
+    end
 
     describe "#address_line2" do
-      it "returns nil" do
+      it "returns address_line2" do
         expect(presenter.address_line2).to be_nil
       end
     end
+
+    describe "#town_or_city" do
+      it "returns town_or_city" do
+        expect(presenter.town_or_city).to eq("Posttown")
+      end
+    end
   end
 end