Fix signin methods and modes handling by using new options-manager