diff --git a/secrets/env b/secrets/env
index 55e10bc..9d4d342 100755
--- a/secrets/env
+++ b/secrets/env
@@ -1,15 +1,18 @@
 #!/bin/bash
-export PASS_LIBREFM="$(pass entertainment/libre.fm | head -n 1)"
-export PASS_MUSICBRAINZ="$(pass entertainment/musicbrainz.org | head -n 1)"
+export PASS_LIBREFM="$(pass entertainment/libre.fm | head -1)"
+export PASS_MUSICBRAINZ="$(pass entertainment/musicbrainz.org | head -1)"
 export PASS_LISTENBRAINZ="$(pass entertainment/musicbrainz.org | rg 'listenbrainz_token' | cut -d' ' -f2-)"
-export PASS_MUSPY="$(pass entertainment/muspy.com | head -n 1)"
-export PASS_ARIA2="$(pass linux/aria2 | head -n 1)"
-export PASS_MPD="$(pass linux/mpd | head -n 1)"
-export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -n 1)"
-export PASS_IPMI="$(pass selfhosted/idrac | head -n 1)"
-export PASS_MQTT="$(pass selfhosted/mqtt.reekynet.com | head -n 1)"
+export PASS_MUSPY="$(pass entertainment/muspy.com | head -1)"
+export PASS_ARIA2="$(pass linux/aria2 | head -1)"
+export PASS_MPD="$(pass linux/mpd | head -1)"
+export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -1)"
+export PASS_IPMI="$(pass selfhosted/idrac | head -1)"
+export PASS_MQTT="$(pass selfhosted/mqtt.reekynet.com | head -1)"
 
-export ME_FULLNAME="$(pass me | head -n 1)"
+export PASS_EMAIL_MARKO="$(pass email/marko@korhonen.cc | head -1)"
+export PASS_EMAIL_ADMIN="$(pass email/admin@korhonen.cc | head -1)"
+
+export ME_FULLNAME="$(pass me | head -1)"
 export ME_ADDRESS="$(pass me | rg 'address' | cut -d' ' -f2-)"
 export ME_PHONE="$(pass me | rg 'phone' | cut -d' ' -f2-)"
 
@@ -19,6 +22,3 @@ export WIREGUARD_MIRKWOOD_PSK="$(pass selfhosted/wireguard/mirkwood | grep PreSh
 
 export WIREGUARD_MORIA_PRIVKEY="$(pass selfhosted/wireguard/moria | grep PrivateKey | cut -d' ' -f2-)"
 export WIREGUARD_MORIA_PUBKEY="$(pass selfhosted/wireguard/moria | grep PublicKey | cut -d' ' -f2-)"
-
-export EMAIL_MARKO_PASS="$(pass email/marko@korhonen.cc | head -1)"
-export EMAIL_ADMIN_PASS="$(pass email/admin@korhonen.cc | head -1)"
diff --git a/secrets/secrets.sh b/secrets/secrets.sh
index 535020d..3f866ad 100755
--- a/secrets/secrets.sh
+++ b/secrets/secrets.sh
@@ -13,6 +13,9 @@ export PASS_MPD_ADMIN="$PASS_MPD_ADMIN"
 export PASS_IPMI="$PASS_IPMI"
 export PASS_MQTT="$PASS_MQTT"
 
+export PASS_EMAIL_MARKO="$PASS_EMAIL_MARKO"
+export PASS_EMAIL_ADMIN="$PASS_EMAIL_MARKO"
+
 export ME_FULLNAME="$ME_FULLNAME"
 export ME_ADDRESS="$ME_ADDRESS"
 export ME_PHONE="$ME_PHONE"
@@ -23,9 +26,6 @@ export WIREGUARD_MIRKWOOD_PSK="$WIREGUARD_MIRKWOOD_PSK"
 
 export WIREGUARD_MORIA_PRIVKEY="$WIREGUARD_MORIA_PRIVKEY"
 export WIREGUARD_MORIA_PUBKEY="$WIREGUARD_MORIA_PUBKEY"
-
-export EMAIL_MARKO_PASS="$EMAIL_MARKO_PASS"
-export EMAIL_ADMIN_PASS="$EMAIL_MARKO_PASS"
 SECRET
 
 chmod 600 $DOTREPO/secrets/secrets