diff --git a/classes/profilefhelper.php b/classes/profilefhelper.php
index a3bbe56..ce200b1 100644
--- a/classes/profilefhelper.php
+++ b/classes/profilefhelper.php
@@ -149,7 +149,11 @@ class profilehelper {
         }
 
         $field->enrolled = in_array($userid,self::enrollable_user_ids())?1:0;
-        $field->track = self::get_track_identifier($userid);
+        if ($field->enrolled) {
+            // Only update the track with the new data if the user is currently enrollable.
+            // This makes it simpler to create a new track if the track is changed later.
+            $field->track = self::get_track_identifier($userid);
+        }
         $field->coach = self::get_coach_userid($userid);
 
         if (isset($toolbox)) {
diff --git a/classes/task/profilescannertask.php b/classes/task/profilescannertask.php
index 69883d1..6613593 100644
--- a/classes/task/profilescannertask.php
+++ b/classes/task/profilescannertask.php
@@ -167,7 +167,6 @@ class profilescannertask extends \core\task\scheduled_task {
                 mtrace("Error retrieving fields for user {$user->username}");
                 mtrace_exception($x);
             }
-
         }
     }
 }