Pre-filling fields and corrected account page