fixed for #2 - change password not working and other improvements