diff --git a/scripts/mount_edi.sh b/scripts/mount_edi.sh
index 8e8b006..9ed5648 100755
--- a/scripts/mount_edi.sh
+++ b/scripts/mount_edi.sh
@@ -3,6 +3,4 @@ set -euo pipefail
 
 source /sync/scripts/mount_general.sh
 
-user=$(whoami)
-
-sshMount edi edi $user FabisDokumente
+sshMount edi edi fabian FabisDokumente
diff --git a/scripts/mount_garrus.sh b/scripts/mount_garrus.sh
index 5186a33..1f99015 100755
--- a/scripts/mount_garrus.sh
+++ b/scripts/mount_garrus.sh
@@ -3,6 +3,4 @@ set -euo pipefail
 
 source /sync/scripts/mount_general.sh
 
-user=$(whoami)
-
-sshMount fabian garrus $user FabisDokumente media Filme
+sshMount fabian garrus fabian FabisDokumente media Filme
diff --git a/scripts/mount_general.sh b/scripts/mount_general.sh
index 6e87eba..8519483 100644
--- a/scripts/mount_general.sh
+++ b/scripts/mount_general.sh
@@ -2,10 +2,13 @@
 set -euo pipefail
 
 sshMount () {
+   clientUser=$(whoami);
+   serverUser=$1;
+   serverHost=$2;
+   shift 2;
    args=($@)
-   args=(${args[@]:2})
    for ((i=0; i < ${#args[@]}; i=i + 2)); do
-      sshfs $1@$2:/citadel/${args[$i]}/ /home/fabian/${args[$i + 1]}/ -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=8
+      sshfs ${serverUser}@${serverHost}:/citadel/${args[$i]}/ /home/${clientUser}/${args[$i + 1]}/ -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=8
    done
 }