diff --git a/install.sh b/install.sh
index aa03eb2..3d3a911 100755
--- a/install.sh
+++ b/install.sh
@@ -5,19 +5,38 @@ source "$(dirname "$0")/variables.conf"
 # TODO handle non-Systemd systems
 
 echo "Copying Systemd units to system directory..."
-sudo cp systemd-templates/conf-sync.service /etc/systemd/system/
-sudo sed -i -e "s/PH_USER/$(whoami)/g" /etc/systemd/system/conf-sync.service
-sudo sed -i -e "s:PH_DIRECTORY:$(pwd):g" /etc/systemd/system/conf-sync.service
-if $client_type == "server"; then # TODO not finished
-  sudo cp systemd-templates/dns-update.timer /etc/systemd/system/conf-sync.timer
+if [[ $user != 'root' ]]; then
+  sudo cp systemd-templates/conf-sync.service /etc/systemd/system/
+  sudo sed -i -e "s/PH_USER/$(whoami)/g" /etc/systemd/system/conf-sync.service
+  sudo sed -i -e "s:PH_DIRECTORY:$(pwd):g" /etc/systemd/system/conf-sync.service
+  if $client_type == "server"; then
+    sudo cp systemd-templates/conf-sync-server.timer /etc/systemd/system/conf-sync.timer
+  else
+    sudo cp systemd-templates/conf-sync-desktop.timer /etc/systemd/system/conf-sync.timer
+  fi
 else
-  sudo cp systemd-templates/dns-update.timer /etc/systemd/system/conf-sync.timer
+  cp systemd-templates/conf-sync.service /etc/systemd/system/
+  sed -i -e "s/PH_USER/$(whoami)/g" /etc/systemd/system/conf-sync.service
+  sed -i -e "s:PH_DIRECTORY:$(pwd):g" /etc/systemd/system/conf-sync.service
+  if $client_type == "server"; then
+    cp systemd-templates/conf-sync-server.timer /etc/systemd/system/conf-sync.timer
+  else
+    cp systemd-templates/conf-sync-desktop.timer /etc/systemd/system/conf-sync.timer
+  fi
 fi
 
 echo "Reloading Systemd..."
-sudo systemctl daemon-reload
+if [[ $user != 'root' ]]; then
+  sudo systemctl daemon-reload
+else
+  systemctl daemon-reload
+fi
 echo "Enabling timer (not starting it, either do it manually or reboot)..."
-sudo systemctl enable conf-sync.timer
+if [[ $user != 'root' ]]; then
+  sudo systemctl enable conf-sync.timer
+else
+  systemctl enable conf-sync.timer
+fi
 
 echo "Finished install. Exiting..."
 exit 0