Work on Password Change, refactor to form