changing structure of forms part 4
captcha and birthday element not refarctored

Signed-off-by: Alexander Book <redchrome@gmx.de>