diff --git a/lib/customers.js b/lib/customers.js
index 3a42eff7..25d4d7f9 100644
--- a/lib/customers.js
+++ b/lib/customers.js
@@ -72,9 +72,14 @@ function get (phone) {
 function update (id, data, userToken, txId) {
   const formattedData = _.omit(['id'], _.mapKeys(_.snakeCase, data))
 
+  console.log(formattedData)
+
   const enhancedUpdateData = enhanceAtFields(enhanceOverrideFields(formattedData, userToken))
+  console.log(enhancedUpdateData)
   const updateData = updateRawData(updateOverride(enhancedUpdateData))
 
+  console.log(updateData)
+
   const sql = Pgp.helpers.update(updateData, _.keys(updateData), 'customers') +
     ' where id=$1 returning *'
 
@@ -286,9 +291,11 @@ function updateRawData (fields) {
     'id_card_data'
   ]
 
-  const fieldsToUpdate = _.pick(fieldsWithRawData, fields)
-  const rawFields = _.fromPairs(_.map(f => [`${f}_raw`, JSON.stringify(fieldsToUpdate[f].raw)], _.keys(fieldsToUpdate)))
-  const fieldsWithoutRawData = _.mapValues(f => _.omit(['raw'], f), fieldsToUpdate)
+  const fieldsToUpdate = _.intersection(fieldsWithRawData, _.keys(fields))
+  const rawFields = _.fromPairs(_.map(f => [`${f}_raw`, JSON.stringify(fields[f].raw)], fieldsToUpdate))
+  const fieldsWithoutRawData = _.mapValues(f => {
+    return _.has(f, 'raw') ? _.omit(['raw'], f) : f
+  }, fields)
 
   return _.merge(fieldsWithoutRawData, rawFields)
 }