diff --git a/install.sh b/install.sh
index 6ee2ce4..c1cf86f 100644
--- a/install.sh
+++ b/install.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 
 # Helper function which echo's all commands before executing them in grayscale prefixed with >
 echo_cmd() {
@@ -6,6 +7,11 @@ echo_cmd() {
     eval "$1"
 }
 
+INSTALL_BIN="/usr/local/bin/qu"
+SERVICE_FILE="/etc/systemd/system/qu.service"
+SERVICE_USER="${SUDO_USER:-$(whoami)}"
+SERVICE_GROUP="$(id -gn "$SERVICE_USER" 2>/dev/null || echo root)"
+
 # Check if jq and curl are installed, if not, error out and ask the user to install them
 if ! command -v jq > /dev/null; then
     echo "Error: jq is not installed. Please install jq and try again."
@@ -17,7 +23,7 @@ if ! command -v curl > /dev/null; then
 fi
 
 # Check if the user is allowed to write to /usr/local/bin, if so, install qu there, else error out and ask the user to install qu manually
-if [ -w "/usr/local/bin" ]; then
+if [ -w "$(dirname "$INSTALL_BIN")" ]; then
 # Get release tag by $(curl -s https://git.cer.sh/api/v1/repos/axodouble/quptime/releases/latest | jq -r '.tag_name')
     RELEASE=$(curl -s https://git.cer.sh/api/v1/repos/axodouble/quptime/releases/latest | jq -r '.tag_name')
     # Download the latest release binary from the Git repository and save it to /usr/local/bin/qu
@@ -29,20 +35,24 @@ if [ -w "/usr/local/bin" ]; then
         # Drop completions into the directories each shell already scans.
         # No rc-file edits, and uninstall is just `rm`. Silently skips
         # shells whose completion dir is absent.
-        write_completion() {
-            local shell=$1 path=$2
-            [ -d "$(dirname "$path")" ] || return 1
-            if /usr/local/bin/qu completion "$shell" > "$path" 2>/dev/null; then
-                echo "> installed $shell completion -> $path"
-                return 0
-            fi
-            rm -f "$path"
-            return 1
-        }
-        write_completion bash /usr/share/bash-completion/completions/qu \
-            || write_completion bash /etc/bash_completion.d/qu
-        write_completion zsh  /usr/share/zsh/site-functions/_qu
-        write_completion fish /usr/share/fish/vendor_completions.d/qu.fish
+        if "$INSTALL_BIN" --help 2>/dev/null | grep -q "completion"; then
+            write_completion() {
+                local shell=$1 path=$2
+                [ -d "$(dirname "$path")" ] || return 1
+                if "$INSTALL_BIN" completion "$shell" > "$path" 2>/dev/null; then
+                    echo "> installed $shell completion -> $path"
+                    return 0
+                fi
+                rm -f "$path"
+                return 1
+            }
+            write_completion bash /usr/share/bash-completion/completions/qu \
+                || write_completion bash /etc/bash_completion.d/qu
+            write_completion zsh  /usr/share/zsh/site-functions/_qu
+            write_completion fish /usr/share/fish/vendor_completions.d/qu.fish
+        else
+            echo "> qu does not expose completion support; skipping shell completion installation."
+        fi
     else
         echo "Error: curl is not installed. Please install curl and try again."
         exit 1
@@ -55,24 +65,26 @@ fi
 # Check if the user has systemd, if so create a systemd service file for qu serve
 if command -v systemctl > /dev/null; then
     echo "> Creating systemd service file for qu serve..."
-    cat <<EOL > /etc/systemd/system/qu-serve.service
+
+    cat <<EOL > "$SERVICE_FILE"
 [Unit]
 Description=QUptime Serve
 After=network.target
 
 [Service]
-ExecStart=/usr/local/bin/qu serve
+ExecStart=$INSTALL_BIN serve
 Restart=always
-User=$(whoami)
+User=$SERVICE_USER
+Group=$SERVICE_GROUP
 
 [Install]
 WantedBy=multi-user.target
 EOL
     echo_cmd "systemctl daemon-reload"
-    echo_cmd "systemctl enable qu-serve.service"
-    echo "> qu serve service has been created and enabled. You can start it with 'systemctl start qu-serve.service'"
+    echo_cmd "systemctl enable $(basename "$SERVICE_FILE")"
+    echo "> qu serve service has been created and enabled. You can start it with 'systemctl start $(basename "$SERVICE_FILE")'"
 else
-    echo "> Warning: systemd is not available on this system. qu serve will not be automatically started on boot. You can start it manually with '/usr/local/bin/qu serve'"
+    echo "> Warning: systemd is not available on this system. qu serve will not be automatically started on boot. You can start it manually with '$INSTALL_BIN serve'"
 fi
 
 echo "Installation complete, before starting `qu serve`, make sure to run `qu init` and read the documentation."