*8812* Improve context/profile/registration form behavior