diff --git a/wplist b/wplist
index 1ac43cf..88d389a 100755
--- a/wplist
+++ b/wplist
@@ -1,5 +1,5 @@
 #!/bin/bash
 # collates a list of wallpapers available on a samba share.
-
-ls /home/brendo/Wallpapers > ../wp.list
+SHARE_USER="brendo"
+ls /home/$SHARE_USER/Wallpapers > ../wp.list
 echo "list collated, cleaning up and closing"
diff --git a/wpset b/wpset
index 40692dd..8b6ea73 100755
--- a/wpset
+++ b/wpset
@@ -1,6 +1,6 @@
 #!/bin/bash
 # WPDL
-VERSION="0.1-rev80"
+VERSION="0.1-rev81"
 CONF="/home/$USER/.config/wpdl.conf"
 source $CONF
 
@@ -29,7 +29,7 @@ function wplist() {
 
 function listupdate() {
   echo "updating wallpaper list..."
-  ssh $SSH_USER@$SSH_HOST "bash /home/sysadmin/bin/wplist" &> /dev/null
+  ssh $SSH_USER@$SSH_HOST "bash /home/$SSH_USER/bin/wplist" &> /dev/null
 }
 
 listupdate
@@ -65,7 +65,7 @@ else
 WPLIST=$(wplist | grep $1)
 if [ "$WPLIST" = "$1" ]; then
  # download the actual script
- curl -s sftp://brendo.org/home/sysadmin/bin/wpdl -u sysadmin: -o wpdl
+ curl -s sftp://$SSH_HOST/home/$SSH_USER/bin/wpdl -u $SSH_USER: -o wpdl
  chmod +x wpdl
  clear
  $PWD/wpdl $*