fixes in register form
Merge branch 'g33k1ns1d3's-l0cal'