Tim Ötting fixed bug for required fields