Fix change password bugs