Improved registration form (issue #41)