diff --git a/app/controllers/profile_field_groups_controller.rb b/app/controllers/profile_field_groups_controller.rb
index 6ac739739..82151eef3 100644
--- a/app/controllers/profile_field_groups_controller.rb
+++ b/app/controllers/profile_field_groups_controller.rb
@@ -2,6 +2,13 @@ class ProfileFieldGroupsController < ApplicationController
   def index
     relation = ProfileFieldGroup.includes(:profile_fields)
     @profile_field_groups = onboarding? ? relation.onboarding : relation.all
+    if onboarding?
+      current_user.update(
+        saw_onboarding: true,
+        checked_code_of_conduct: true,
+        checked_terms_and_conditions: true,
+      )
+    end
   end
 
   private