remove required for password and confirm_password fields
Merge branch 'fix-user-edit'