diff --git a/bridgehead b/bridgehead
index b14d1d3..9824e3b 100755
--- a/bridgehead
+++ b/bridgehead
@@ -105,7 +105,22 @@ case "$ACTION" in
 		;;
 	enroll)
 		loadVars
-		docker run --rm -ti -v /etc/bridgehead/pki:/etc/bridgehead/pki samply/beam-enroll:latest --output-file $PRIVATEKEYFILENAME --proxy-id $PROXY_ID --admin-email $SUPPORT_EMAIL
+
+		MANUAL_PROXY_ID="${3:-$PROXY_ID}"
+		if [ -z "$MANUAL_PROXY_ID" ]; then
+			log ERROR "No Proxy ID set"
+			exit 1
+		else
+			log INFO "Enrolling Beam Proxy Id $MANUAL_PROXY_ID"
+		fi
+
+		if [ -z "$SUPPORT_EMAIL" ]; then
+			EMAIL_PARAM=""
+		else
+			EMAIL_PARAM="--admin-email $SUPPORT_EMAIL"
+		fi
+			
+		docker run --rm -ti -v /etc/bridgehead/pki:/etc/bridgehead/pki samply/beam-enroll:latest --output-file $PRIVATEKEYFILENAME --proxy-id $MANUAL_PROXY_ID $EMAIL_PARAM
 		chmod 600 $PRIVATEKEYFILENAME
 		;;
 	preRun | preUpdate)
diff --git a/minimal/vars b/minimal/vars
index fe661ed..11d07ff 100644
--- a/minimal/vars
+++ b/minimal/vars
@@ -3,3 +3,4 @@ do
     log DEBUG "sourcing $module"
     source $module
 done
+PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem