Fixing the lookup of credential from env.