diff --git a/web/modules/custom/google_map_autofill/google_map_autofill.module b/web/modules/custom/google_map_autofill/google_map_autofill.module
index aa704bdece57d28e17de3c575b346e2b1fd48c58..dc90a56c3092596b342d2e777a4358f8cf827d98 100644
--- a/web/modules/custom/google_map_autofill/google_map_autofill.module
+++ b/web/modules/custom/google_map_autofill/google_map_autofill.module
@@ -6,6 +6,9 @@ function google_map_autofill_form_alter(&$form, &$form_state, $form_id) {
   if(in_array($form_id,['user-register-form','user_register_form'])) {
     $form['field_google_map']['#disabled'] = 'disabled';
   }
+  if(in_array($form_id,['node_departments_centers_form','node_departments_centers_edit_form'])) {
+    $form['field_dc_google_map']['#disabled'] = 'disabled';
+  }
 }
 
 function google_map_autofill_entity_presave(Drupal\Core\Entity\EntityInterface $entity) {
@@ -16,4 +19,11 @@ function google_map_autofill_entity_presave(Drupal\Core\Entity\EntityInterface $
     $entity->field_google_map->value = $address;
     //save is done automatically
   }
+  if($entity->bundle() == "departments_centers"){
+    //get content from field_address and check it for linebreaks; if linebreaks exist replace them with single space
+    $address = trim(preg_replace('/\s+/', ' ', $entity->field_dc_address->value));
+    //set field_google_map value to equal field_address
+    $entity->field_dc_google_map->value = $address;
+    //save is done automatically
+  }
 }