Remove some hacky code
Add i18n message for unprovided birthdate