diff --git a/Node/real-estate/queries.js b/Node/real-estate/queries.js
index 4b9923f..4444714 100644
--- a/Node/real-estate/queries.js
+++ b/Node/real-estate/queries.js
@@ -8,7 +8,10 @@ const pool = new Pool({
 });
 
 const getAllRealEstate = (request, response) => {
-  pool.query("SELECT * FROM real_estate ORDER BY id DESC", (error, results) => {
+  // The express-jwt middleware decodes the jwt token and store all claims on request.user
+  // https://github.com/auth0/express-jwt/issues/153#issuecomment-269498310
+  citizen_upn = request.user.sub;
+  pool.query(`SELECT * FROM real_estate WHERE citizen_upn = '${citizen_upn}' ORDER BY id DESC`, (error, results) => {
     if (error) {
       throw error;
     }
@@ -16,10 +19,10 @@ const getAllRealEstate = (request, response) => {
   });
 };
 
-// We don't need the citizen_upn here? ** Temporary **
 const insertRealEstate = (request, response) => {
-  const { address, area, citizen_upn } = request.body;
-
+  const { address, area } = request.body;
+  citizen_upn = request.user.sub;
+  console.log(citizen_upn)
   pool.query(
     "INSERT INTO real_estate (address, area, citizen_upn) VALUES ($1, $2, $3)",
     [address, area, citizen_upn],
diff --git a/React/real-estate/src/pages/components/VehicleRegisterForm.js b/React/real-estate/src/pages/components/VehicleRegisterForm.js
index 633f8fa..377029c 100644
--- a/React/real-estate/src/pages/components/VehicleRegisterForm.js
+++ b/React/real-estate/src/pages/components/VehicleRegisterForm.js
@@ -21,7 +21,7 @@ const VehicleRegisterForm = () => {
 
   async function registerVehicle() {
     await apiService.registerVehicle(
-      { address, area, citizen_upn: user.profile.sub },
+      { address, area },
       user.access_token
     );
     history.push("/");
diff --git a/React/real-estate/src/pages/components/table/Table.js b/React/real-estate/src/pages/components/table/Table.js
index b312455..1e23780 100644
--- a/React/real-estate/src/pages/components/table/Table.js
+++ b/React/real-estate/src/pages/components/table/Table.js
@@ -11,7 +11,6 @@ const Table = ({ vehicleData }) => {
           <tr>
             <ColumnName text={"Address"} />
             <ColumnName text={"Area"} />
-            <ColumnName text={"Citizen UPN"} />
             <th scope="col" className="relative px-6 py-3">
               <span className="sr-only">Actions</span>
             </th>
@@ -22,7 +21,6 @@ const Table = ({ vehicleData }) => {
             <tr key={vehicle.id} className="bg-gray-50">
               <TableData text={vehicle.address} />
               <TableData text={vehicle.area} />
-              <TableData text={vehicle.citizen_upn} />
               <TableData Component={EditBtns} />
             </tr>
           ))}