Forms have been updated.

Simpler form structure ommitting confim password