Fix environment variables

They need to be set even if it is not login