Fixed bug in form filling due to refactor
Fixed missing security question field.