Having to press "Clock in" before changing the activity and site is counter intuitive

Employees working from home regularly select their Site and Activity BEFORE hitting Clock in when using the app, as this seems more logical that changing the site and activity after clocking in. This causes issues with the fire register. As the order has to be clock in first, perhaps changing the activity and site should be on a follow up screen, or greyed out until after clock in.