diff --git a/pkg/factory/move_factory.go b/pkg/factory/move_factory.go
index 3f923f95204..8561df50127 100644
--- a/pkg/factory/move_factory.go
+++ b/pkg/factory/move_factory.go
@@ -105,11 +105,6 @@ func BuildMove(db *pop.Connection, customs []Customization, traits []Trait) mode
 		move.CloseoutOfficeID = &closeoutOffice.ID
 	}
 
-	if scAssignedUserResult != nil {
-		move.SCAssignedUser = &scAssignedUser
-		move.SCAssignedID = &scAssignedUser.ID
-	}
-
 	if tooAssignedUserResult != nil {
 		move.TOOAssignedUser = &tooAssignedUser
 		move.TOOAssignedID = &tooAssignedUser.ID
@@ -125,6 +120,11 @@ func BuildMove(db *pop.Connection, customs []Customization, traits []Trait) mode
 		move.CounselingOfficeID = &counselingOffice.ID
 	}
 
+	if scAssignedUserResult != nil {
+		move.SCAssignedUser = &scAssignedUser
+		move.SCAssignedID = &scAssignedUser.ID
+	}
+
 	// Overwrite values with those from assertions
 	testdatagen.MergeModels(&move, cMove)