[FormBundle] Improve logic
[UserBundle] Follow update of FormBundle