Auth step fix