fix form validation
fix form validation also for citizen