diff --git a/includes/discovery/load/dsm.inc.php b/includes/discovery/load/dsm.inc.php
index 0365eacd6..fdefb5efb 100644
--- a/includes/discovery/load/dsm.inc.php
+++ b/includes/discovery/load/dsm.inc.php
@@ -19,6 +19,11 @@ if ($device['os'] == "dsm") {
 	// UPS Device Manufacturer, example return : SNMPv2-SMI::enterprises.6574.4.1.2.0 = STRING: "American Power Conversion"
 	$ups_device_manufacturer_oid = '.1.3.6.1.4.1.6574.4.1.2.0';
 	$ups_device_manufacturer = str_replace('"', '', snmp_get($device, $ups_device_manufacturer_oid, "-Oqv"));
+	// Too long name for APC
+	if($ups_device_manufacturer == "American Power Conversion") {
+		$ups_device_manufacturer = "APC";
+	}
+
 	// UPS Device Model, example return : SNMPv2-SMI::enterprises.6574.4.1.1.0 = STRING: "Back-UPS RS 900G"
 	$ups_device_model_oid = '.1.3.6.1.4.1.6574.4.1.1.0';
 	$ups_device_model = str_replace('"', '', snmp_get($device, $ups_device_model_oid, "-Oqv"));
@@ -28,7 +33,7 @@ if ($device['os'] == "dsm") {
 	$ups_load_oid = '.1.3.6.1.4.1.6574.4.2.12.1.0';
 	$ups_load = snmp_get($device, $ups_load_oid, "-Oqv");
 	if (is_numeric($ups_load)) {
-		discover_sensor($valid['sensor'], 'load', $device, $ups_load_oid, 'UPSLoad', $ups_device_manufacturer.' '.$ups_device_model, 'UPS Load', '1', '1', 0, NULL, NULL, 100, intval($ups_load));
+		discover_sensor($valid['sensor'], 'load', $device, $ups_load_oid, 0, 'snmp', $ups_device_manufacturer.' '.$ups_device_model.' - UPS Load', '1', '1', 0, NULL, NULL, 100, intval($ups_load));
 	}
 }