Added cancel button to edit form
Editing no longer reqiures setting password