first modifications to reuse login session for currentProduction