Changes: handle non-default login-handler