Adds validation to registration and closes #7