Hotfix/change password

Refactors