Fix issues from previous commit
More changes to keep proxy settings for all users