diff --git a/web/ssh-tunnelier b/web/ssh-tunnelier
index c710b84..a23cce1 100755
--- a/web/ssh-tunnelier
+++ b/web/ssh-tunnelier
@@ -2,7 +2,8 @@
 
 CONFDIR="$HOME/.config/ssh-tunnelier"
 CONF="$CONFDIR/config"
-MAGIC_TIME=873749328
+# Just over a week
+MAGIC_TIME=604813
 
 BASE="base64 -w 0"
 UNBASE="base64 -d"
@@ -61,7 +62,7 @@ function get_id() {
 
 function get_command() {
   switches=$( echo "$1" | $UNBASE )
-  echo -n "ssh -f -n $switches \"sleep $MAGIC_TIME; echo tunneler $1\""
+  echo -n "ssh -f -n $switches \"/bin/sh -O huponexit -c 'sleep $MAGIC_TIME'; echo tunneler $1\""
 }
 
 function get_pid() {
@@ -101,7 +102,7 @@ function run_args() {
     REMOTE="$3"
     [[ -z "$REMOTE" ]] && REMOTE="$LOCAL"
     echo Connect to $HOST
-    ssh -f -n -L "${LOCAL}:localhost:${REMOTE}" "$HOST" "sleep $MAGIC_TIME"
+    ssh -f -n -L "${LOCAL}:localhost:${REMOTE}" "$HOST" "/bin/sh -O huponexit -c 'sleep $MAGIC_TIME'"
 }
 
 function run_command() {