diff --git a/lib/Drupal/migrate/Plugin/migrate/source/d6/User.php b/lib/Drupal/migrate/Plugin/migrate/source/d6/User.php
index 0e586ae..ed3e5b6 100644
--- a/lib/Drupal/migrate/Plugin/migrate/source/d6/User.php
+++ b/lib/Drupal/migrate/Plugin/migrate/source/d6/User.php
@@ -22,7 +22,7 @@ class User extends SqlBase {
   function query() {
     $query = $this->database
       ->select('users', 'u')
-      ->fields('u', array('uid', 'name', 'pass', 'mail', 'mode', 'sort', 'threshold', 'theme', 'signature', 'signature_format', 'created', 'access', 'login', 'status', 'timezone', 'language', 'picture', 'init', 'data', 'timezone'))
+      ->fields('u', array('uid', 'name', 'pass', 'mail', 'mode', 'sort', 'threshold', 'theme', 'signature', 'signature_format', 'created', 'access', 'login', 'status', 'timezone', 'language', 'picture', 'init', 'data', 'timezone_name'))
       ->condition('uid', 0, '>');
     return $query;
   }
@@ -54,4 +54,25 @@ class User extends SqlBase {
     );
   }
 
+  function prepareRow(Row $row, $keep = TRUE) {
+    $ = array();
+    // Find profile values for this row.
+    $results = $this->database
+      ->select('profile_values', 'pv', array('fetch' => \PDO::FETCH_ASSOC))
+      ->fields('pv', array('fid', 'value'))
+      ->condition('uid', $row->getSourceProperty('uid'))
+      ->execute();
+    foreach ($results as $profile_value) {
+      //Get machine name of profile field
+      $pf_machine_name = $this->database(
+        ->select('profile_fields', 'pf')
+        ->fields('pf', array('name'))
+        ->condition('fid', $profile_value['fid'])
+        ->fetchField();
+
+      $row->setSourceProperty($pf_machine_name, array($profile_value['value']));
+    }
+    return parent::prepareRow($row);
+  }
+
 }