diff --git a/backend/.env.example b/backend/.env.example
index 873912f28..da11119f5 100644
--- a/backend/.env.example
+++ b/backend/.env.example
@@ -4,6 +4,10 @@
 # Logging level: DEBUG|INFO|WARNING|ERROR|CRITICAL
 LOG_LEVEL=ERROR
 LOG_USE_STREAM=1
+# Possible values: prod, dev
+APP_ENV=dev
+# List of comma separated admin usernames. USE WITH CAUTION! Those can do serious damage to the data.
+APP_ADMIN_ALLOW_LIST=
 
 # -- FRONTEND --
 FRONTEND_URL=http://localhost:8080
@@ -20,12 +24,10 @@ DB_SECRET=
 SESSION_SECRET=
 
 # -- MAIL --
-
 # Service email for emails on behalf of Thunderbird Appointment
 SERVICE_EMAIL=no-reply@appointment.day
 # Email address for contact or support requests. If the value is empty the support form will error out
 SUPPORT_EMAIL=
-
 # Connection security: SSL|STARTTLS|NONE
 SMTP_SECURITY=NONE
 # Address and port of the SMTP server
@@ -34,6 +36,8 @@ SMTP_PORT=8050
 # SMTP user credentials
 SMTP_USER=
 SMTP_PASS=
+# Authorized email address for sending emails, leave empty to default to organizer
+SMTP_SENDER=
 
 # -- TIERS --
 # Max number of calendars to be simultanously connected for members of the basic tier
@@ -43,6 +47,22 @@ TIER_PLUS_CALENDAR_LIMIT=5
 # Max number of calendars to be simultanously connected for members of the pro tier
 TIER_PRO_CALENDAR_LIMIT=10
 
+# -- GENERAL AUTHENTICATION --
+# Possible values: password, fxa
+AUTH_SCHEME=password
+
+# For password auth only!
+JWT_SECRET=
+JWT_ALGO=HS256
+JWT_EXPIRE_IN_MINS=10000
+
+# -- FIREFOX AUTH --
+FXA_OPEN_ID_CONFIG=
+FXA_CLIENT_ID=
+FXA_SECRET=
+FXA_CALLBACK=
+FXA_ALLOW_LIST=
+
 # -- GOOGLE AUTH --
 GOOGLE_AUTH_CLIENT_ID=
 GOOGLE_AUTH_SECRET=
@@ -58,23 +78,9 @@ ZOOM_AUTH_CALLBACK=http://localhost:8090/zoom/callback
 # -- SIGNED URL SECRET --
 # Shared secret for url signing (e.g. create it by running `openssl rand -hex 32`)
 SIGNED_SECRET=
+
 # If empty, sentry will be disabled
 SENTRY_DSN=
-# Possible values: prod, dev
-APP_ENV=dev
-# Possible values: password, fxa
-AUTH_SCHEME=password
-
-FXA_OPEN_ID_CONFIG=
-FXA_CLIENT_ID=
-FXA_SECRET=
-FXA_CALLBACK=
-FXA_ALLOW_LIST=
-
-# For password auth only!
-JWT_SECRET=
-JWT_ALGO=HS256
-JWT_EXPIRE_IN_MINS=10000
 
 # -- TESTING --
 AUTH0_TEST_USER=
diff --git a/backend/.env.test b/backend/.env.test
index 4c2ce96e0..a0c17077f 100644
--- a/backend/.env.test
+++ b/backend/.env.test
@@ -20,7 +20,6 @@ DB_SECRET=db-secret-pls-ignore
 SESSION_SECRET=session-secret-pls-ignore
 
 # -- MAIL --
-
 # Service email for emails on behalf of Thunderbird Appointment
 SERVICE_EMAIL=no-reply@appointment.day
 # Email address for contact or support requests
@@ -64,6 +63,7 @@ SIGNED_SECRET=test-secret-pls-ignore
 SENTRY_DSN=
 # Possible values: prod, dev, test
 APP_ENV=test
+# Possible values: password, fxa
 AUTH_SCHEME=password
 
 FXA_OPEN_ID_CONFIG=