small changes to comment form
merge conflict resolved
password model save!