diff --git a/README.md b/README.md
index 235a698..d0fc8d1 100644
--- a/README.md
+++ b/README.md
@@ -53,3 +53,4 @@ This is a table of options the template provides based on the [REVTeX 4.2e](http
| `aapm_journal_type` | choice | mph | false | Allows choosing the American Association of Physicists in Medicine journal type. The following choices are available: |
| `sor_journal_type` | choice | jor | false | Allows choosing the Society of Rheology journal type. The following choices are available:- Journal of Rheology (jor)
|
| `formatting` | choice | onecolumn | false | Allows choosing the type of column formatting (one- or two-column article). The following choices are available: |
+| `aip_disable_corresponding_author_after_affiliations` | boolean | true | false | If set to false, the email of the corresponding author of an AIP journal will not be shown after the affiliations. |
diff --git a/template.tex b/template.tex
index a0d5039..96be171 100644
--- a/template.tex
+++ b/template.tex
@@ -66,6 +66,22 @@
\usepackage{datetime}
[- IMPORTS -]
+[#- if options.styling == "aip" #]
+[#- if options.aip_disable_corresponding_author_after_affiliations #]
+%% Apr 2021: AIP requests that the corresponding
+%% email to be moved after the affiliations
+\makeatletter
+\def\@email#1#2{%
+ \endgroup
+ \patchcmd{\titleblock@produce}
+ {\frontmatter@RRAPformat}
+ {\frontmatter@RRAPformat{\produce@RRAP{*#1\href{mailto:#2}{#2}}}\frontmatter@RRAPformat}
+ {}{}
+}%
+\makeatother
+[#- endif -#]
+[#- endif -#]
+
\begin{document}
[#- if options.preprint #]
\preprint{[-options.preprint-]}
diff --git a/template.yml b/template.yml
index 0155f4a..d5156c1 100644
--- a/template.yml
+++ b/template.yml
@@ -228,6 +228,12 @@ options:
- letterpaper
- a4paper
- a5paper
+ - id: aip_disable_corresponding_author_after_affiliations
+ required: false
+ type: boolean
+ default: true
+ description: >-
+ If set to false, the email of the corresponding author of an AIP journal will not be shown after the affiliations.
files:
- template.tex
- revtex4-2.cls