Fixed minor issues in Change_password + forgot password