Allow re-login, minor fixes for testing