diff --git a/uif.admin.inc b/uif.admin.inc
index 2b29cca..34ee4e8 100755
--- a/uif.admin.inc
+++ b/uif.admin.inc
@@ -376,6 +376,12 @@ function uif_batch_import_users_process($form_state, &$context) {
  */
 function uif_batch_import_users_finished($success, $results, $operations) {
   if ($success) {
+    global $user;
+    if(isset($results['self'])) {
+      uif_update_user($results['self'], $user->uid);
+      $results['updated']++;
+      unset($results['self']);
+    }      
     $done = t('User import complete. ');
     $created = $results['created'] ? format_plural($results['created'], 'One user was created.', '@count users were created.') . ' ' : '';
     $updated = $results['updated'] ? format_plural($results['updated'], 'One user was updated.', '@count users were updated.') . ' ' : '';
@@ -392,6 +398,11 @@ function uif_batch_import_users_finished($success, $results, $operations) {
  */
 function uif_import_user($user_data, $notify, &$results, $form_state) {
   if ($uid = db_result(db_query("SELECT uid FROM {users} WHERE mail='%s'", $user_data['email']))) {
+    global $user;
+    if($uid === $user->uid) {
+      $results['self'] = $user_data;
+      return;
+    }      
     $account = uif_update_user($user_data, $uid, $form_state);
     $results['updated']++;
   }