diff --git a/source/scripts/argon-uninstall.sh b/source/scripts/argon-uninstall.sh
index 2693fcb..94b782f 100644
--- a/source/scripts/argon-uninstall.sh
+++ b/source/scripts/argon-uninstall.sh
@@ -98,13 +98,9 @@ then
 	sudo systemctl stop argonupsrtcd.service
 	sudo systemctl disable argonupsrtcd.service
 
-	sudo systemctl --global stop argononeupsduser.service
-	sudo systemctl --global disable argononeupsduser.service
-
 	# Remove files
 	sudo rm /lib/systemd/system/argononeupsd.service
 	sudo rm /lib/systemd/system/argonupsrtcd.service
-	sudo rm /etc/systemd/user/argononeupsduser.service
 
 	find "/home" -maxdepth 1 -type  d | while read line; do
 		shortcutfile="$line/Desktop/argonone-ups.desktop"
@@ -114,6 +110,40 @@ then
 	done
 fi
 
+
+# Remove UPS daemon if any
+argononeupsscript=$INSTALLATIONFOLDER/argononeupd.py
+if [ -f "$argononeupsscript" ]
+then
+	#sudo rmmod argonbatteryicon
+	# Disable Services
+	sudo systemctl stop argononeupd.service
+	sudo systemctl disable argononeupd.service
+
+	for tmpuser in `awk -F: '{ if ($3 >= 1000) print $1 }' /etc/passwd`
+	do
+		if [ "$tmpuser" != "nobody" ]
+		then
+			sudo -u "$tmpuser" systemctl --user stop argononeupduser.service
+			sudo -u "$tmpuser" systemctl --user disable argononeupduser.service
+		fi
+	done
+	systemctl --user stop argononeupduser.service
+	systemctl --user disable argononeupduser.service
+
+	# Remove files
+	sudo rm /lib/systemd/system/argononeupd.service
+	sudo rm /etc/systemd/user/argononeupduser.service
+
+	find "/home" -maxdepth 1 -type  d | while read line; do
+		shortcutfile="$line/Desktop/argononeup.desktop"
+		if [ -f "$shortcutfile" ]; then
+			sudo rm $shortcutfile
+		fi
+	done
+fi
+
+
 if [ -f "/usr/bin/argon-config" ]
 then
 	sudo rm /usr/bin/argon-config
diff --git a/source/scripts/argon-versioninfo.sh b/source/scripts/argon-versioninfo.sh
index c19a53e..e869da5 100644
--- a/source/scripts/argon-versioninfo.sh
+++ b/source/scripts/argon-versioninfo.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSIONINFO="2601002"
+VERSIONINFO="2601005"
 
 echo "Version $VERSIONINFO"
 if [ -z "$1" ]