diff --git a/opt/urserver/urserver-start b/opt/urserver/urserver-start
index 8c41392..9b2172b 100755
--- a/opt/urserver/urserver-start
+++ b/opt/urserver/urserver-start
@@ -5,11 +5,11 @@
 # Path to installation directory
 #
 EXEC_PATH="/opt/urserver/urserver"
-PID_PATH="$HOME/.urserver/urserver.pid"
 ICON_PATH="/usr/share/icons/hicolor/96x96/apps/urserver.png"
-REMOTES_PATH="$HOME/.urserver/remotes"
-BACKUP_PATH="$HOME/.urserver/backup"
 
+: "${PID_PATH:=$HOME/.urserver/urserver.pid}"
+: "${REMOTES_PATH:=$HOME/.urserver/remotes}"
+: "${BACKUP_PATH:=$HOME/.urserver/backup}"
 
 #
 # Check arguments
diff --git a/opt/urserver/urserver-stop b/opt/urserver/urserver-stop
index 7abe2f0..5a3c7b5 100755
--- a/opt/urserver/urserver-stop
+++ b/opt/urserver/urserver-stop
@@ -4,16 +4,32 @@
 # Path to installation directory
 #
 EXEC_PATH="/opt/urserver/urserver"
-PID_PATH="$HOME/.urserver/urserver.pid"
 ICON_PATH="/usr/share/icons/hicolor/96x96/apps/urserver.png"
 
+: "${PID_PATH:=$HOME/.urserver/urserver.pid}"
+
+#
+# Check arguments
+#
+NO_NOTIFY=false
+
+for var in "$@"
+do
+	if [ "$var" = "--no-notify" ]; then
+		NO_NOTIFY=true
+	fi
+done
+
+
 #
 # Try to show notification
 #
-if hash notify-send 2>/dev/null; then
-   notify-send -i $ICON_PATH 'Unified Remote' 'Stopping Unified Remote Server'
-else
-   echo "notify-send not available"
+if ! "$NO_NOTIFY" = true; then
+    if hash notify-send 2>/dev/null; then
+       notify-send -i $ICON_PATH 'Unified Remote' 'Stopping Unified Remote Server'
+    else
+       echo "notify-send not available"
+    fi
 fi
 
 #