diff --git a/bridgehead b/bridgehead
index 75d1498..3df3df3 100755
--- a/bridgehead
+++ b/bridgehead
@@ -168,6 +168,7 @@ case "$ACTION" in
 		;;
 	gitCredentials)
 		loadVars >&2
+		shift 2
 		exec ./lib/gitpassword.sh $@
 		;;
 	*)
diff --git a/lib/gitpassword.sh b/lib/gitpassword.sh
index 12d0155..c5b3c45 100755
--- a/lib/gitpassword.sh
+++ b/lib/gitpassword.sh
@@ -4,10 +4,6 @@
 
 SECRETS_FILE=/var/cache/bridgehead/secrets/gitetcbridgehead
 
-# Called from bridgehead, so shift 2 times
-shift
-shift
-
 case "$1" in
   erase)
     rm -f $SECRETS_FILE