Added posibility for changing password
Merged code