Reworked linking to form pages with a valid key