diff --git a/docs/Troubleshooting-Tool.md b/docs/Troubleshooting-Tool.md
index 1fb6719df..95760034e 100644
--- a/docs/Troubleshooting-Tool.md
+++ b/docs/Troubleshooting-Tool.md
@@ -14,7 +14,7 @@ The OMS Linux Troubleshooter is designed in order to help find and diagnose issu
 
 ## Installing the Troubleshooter
 
-The OMS Troubleshooter is automatically installed upon installation of the OMS Agent. However, if installation fails in any way, it can also be installed manually by following the steps below.
+**The OMS Troubleshooter is automatically installed upon installation of the OMS Agent.** However, if installation fails in any way, it can also be installed manually by following the steps below.
 
 ### Manual Install of the Troubleshooter
 1. Copy the troubleshooter bundle onto your machine: `wget https://raw.github.com/microsoft/OMS-Agent-for-Linux/master/source/code/troubleshooter/omsagent_tst.tar.gz`
@@ -152,4 +152,4 @@ Below is a list of the errors that can be caught by the troubleshooter:
 | ERR_BACKEND_CONFIG | 153 | Can't pull config from backend |
 | ERR_PYTHON_PKG | 154 | Missing Python package |
 | WARN_INTERNET | 155 | Couldn't verify SSL connection to internet |
-| WARN_ENDPT | 156 | Endpoint SSL connection couldn't be verified |
\ No newline at end of file
+| WARN_ENDPT | 156 | Endpoint SSL connection couldn't be verified |
diff --git a/installer/datafiles/linux.data b/installer/datafiles/linux.data
index b1b2b5483..39cec5a14 100644
--- a/installer/datafiles/linux.data
+++ b/installer/datafiles/linux.data
@@ -76,6 +76,8 @@ fi
 
 # Ensure omsagent is in the omiusers group, but leave omsagent as a group
 /usr/sbin/usermod -g omiusers omsagent 1> /dev/null 2> /dev/null
+# Ensure omsagent is in the omi group as well
+/usr/sbin/usermod -g omi omsagent 1> /dev/null 2> /dev/null
 
 # Add the 'nxautomation' group if it does not already exist
 # (Can't use useradd with -U since that doesn't exist on older systems)
@@ -165,6 +167,10 @@ if ${{PERFORMING_UPGRADE_NOT}}; then
     # Unconfigure sudo if it's already configured
     RemoveSudoersSupport
 
+    # Remove omsagent from the omi group
+    echo "Removing omsagent from the omi group ..."
+    gpasswd -d omsagent omi
+
     # Remove the service accounts
     echo "Deleting nxautomation service account ..."
     userdel nxautomation 2> /dev/null
diff --git a/tools/LogCollector/OMS_Linux_Agent_Log_Collector.md b/tools/LogCollector/OMS_Linux_Agent_Log_Collector.md
index 1a957c6f5..62f9f72d1 100644
--- a/tools/LogCollector/OMS_Linux_Agent_Log_Collector.md
+++ b/tools/LogCollector/OMS_Linux_Agent_Log_Collector.md
@@ -10,6 +10,15 @@ Make sure the target Linux server has the following software installed:
 You can use OMS Log collector to collect logs for both failed and successful installations of the OMS Linux Agent.
 
 ## Log Collector Download:
+
+The Log Collector is automatically installed with the OMS Agent via the [OMS Troubleshooting Tool](https://github.com/microsoft/OMS-Agent-for-Linux/blob/master/docs/Troubleshooting-Tool.md). It can be found by running the Troubleshooting Tool:
+```
+sudo /opt/microsoft/omsagent/bin/troubleshooter
+```
+And choosing Option `L` after startup.
+
+However, if for some reason the Troubleshooting Tool is not installed or working, the Log Collector can be downloaded manually:
+
 - Download the tool and copy to any directory of your choice:
     ```
     wget https://github.com/Microsoft/OMS-Agent-for-Linux/raw/master/tools/LogCollector/download/v7/omslinux_agentlog.tgz