Fix Account Form ans Comments form