switched order of login methods