Mixed up prod & test configs
Fixed potential NPE in CompanyContext before user has logged in