Merged two functions to global.form module
Fixed invalid fields after registration