Fix for new option login