Keep the registration form the way it is.  It works for its intended purpose unless, of course, you are not interested in the integrity of the vote and want to permit non-citizens to vote.  Oh right, that is why you are proposing these changes.