diff --git a/packages/bsp/common/etc/init.d/armhwinfo b/packages/bsp/common/etc/init.d/armhwinfo
index da5f224d8..b607a8d7a 100755
--- a/packages/bsp/common/etc/init.d/armhwinfo
+++ b/packages/bsp/common/etc/init.d/armhwinfo
@@ -275,8 +275,7 @@ log_hardware_info() {
 	echo -e "\n### boot environment:\n" >>${Log}
 	cat /boot/armbianEnv.txt >>${Log} 2>/dev/null || grep -v "^#" /boot/boot.ini | sed '/^\s*$/d' >>${Log}
 	echo -e "\n### lsusb:" >>${Log}
-	[ -f /boot/.force-verbose ] && USBVERBOSE="-v" || echo "" >>${Log}
-	lsusb ${USBVERBOSE} 2>/dev/null >>${Log}
+	lsusb 2>/dev/null >>${Log}
 	echo -e "\n### lscpu:\n" >>${Log}
 	lscpu >>${Log}
 	echo -e "\n### cpuinfo:\n" >>${Log}
diff --git a/packages/bsp/common/usr/bin/armbianmonitor b/packages/bsp/common/usr/bin/armbianmonitor
index 198deaeae..b623be63b 100755
--- a/packages/bsp/common/usr/bin/armbianmonitor
+++ b/packages/bsp/common/usr/bin/armbianmonitor
@@ -743,8 +743,15 @@ gwYNGjRo0KBBw1eEfwH4UoBHAKAAAA==" | base64 --decode | tar xzf -
 
 CollectSupportInfo() {
 	[[ -s /var/log/armhwinfo.log ]] && cat /var/log/armhwinfo.log || zcat /var/log/armhwinfo.log.1.gz
+	LOGLEVEL=$(awk -F'=' '/^verbosity/ {print $2}' /boot/armbianEnv.txt)
+	if [ ${LOGLEVEL} -gt 4 ]; then
+		VERBOSE='-v'
+		which lshw >/dev/null 2>&1 && (echo -e "\n### lshw:" ; lshw -quiet -sanitize -numeric)
+	fi
+	lsusb >/dev/null 2>&1 && (echo -e "\n### lsusb:" ; lsusb ${VERBOSE} 2>/dev/null ; echo "" ; lsusb -t 2>/dev/null)
+	lspci >/dev/null 2>&1 && (echo -e "\n### lspci:" ; lspci ${VERBOSE} 2>/dev/null)
 	[ -z $SUDO_USER ] || echo -e "\n### Group membership of $(groups $SUDO_USER)"
-	echo -e "\n### Installed packages:\n\n$(dpkg -l | egrep "armbian| linux-")"
+	echo -e "\n### Installed packages:\n\n$(dpkg -l | egrep "openmediavault|armbian| linux-")"
 	KernelVersion=$(awk -F" " '{print $3}' < /proc/version)
 	case ${KernelVersion} in
 		3.*)