fix form UI on register
merging