Added change password support