Fix form registration