diff --git a/template.latex b/template.latex
index b171454..93d7b17 100644
--- a/template.latex
+++ b/template.latex
@@ -449,37 +449,43 @@ $endif$
 $endif$
   pdfcreator={LaTeX via pandoc}}
 
+\usepackage{etoolbox}
 $if(title)$
 \title{$title$$if(thanks)$\thanks{$thanks$}$endif$}
 $endif$
 $if(subtitle)$
 $if(beamer)$
 $else$
-\usepackage{etoolbox}
 \makeatletter
 \providecommand{\subtitle}[1]{% add subtitle to \maketitle
   \apptocmd{\@title}{\par {\large #1 \par}}{}{}
 }
-\providecommand{\version}[1]{% add version to \maketitle
-  \apptocmd{\@date}{ -- {\normalsize version #1}}{}{}
-}
-\providecommand{\authorMail}[1]{% add mail author to \maketitle
-  \apptocmd{\@author}{\\ {\normalsize \href{mailto:#1}{#1}}}{}{}
-}
 \makeatother
 $endif$
 \subtitle{$subtitle$}
 $endif$
+$if(author)$
+\makeatletter
+\providecommand{\authorMail}[1]{% add mail author to \maketitle
+  \apptocmd{\@author}{\\ {\normalsize \href{mailto:#1}{#1}}}{}{}
+}
+\makeatother
 \author{$for(author)$$author$$sep$ \and $endfor$}
 $if(authorMail)$
 \authorMail{$authorMail$}
 $endif$
+$endif$
 $if(date)$
 \date{$date$}
 $else$
 \date{\today}
 $endif$
 $if(version)$
+\makeatletter
+\providecommand{\version}[1]{% add version to \maketitle
+  \apptocmd{\@date}{ -- {\normalsize version #1}}{}{}
+}
+\makeatother
 \version{$version$}
 $endif$
 $if(beamer)$