fixed pass
fixed password change
Merge branch 'yurembo'