Eliminate the need for expectations to be set when signing in via bidpom
Also more changes to address the Remember Me screen issue