User form fixes