fix edit password
Merge branch 'feature/fix_edit_password' into develop