Fixed minor issues with reseting passwords