diff --git a/beamerthemeawesome.sty b/beamerthemeawesome.sty
index 5a8e99a..7e628f8 100644
--- a/beamerthemeawesome.sty
+++ b/beamerthemeawesome.sty
@@ -321,8 +321,16 @@
 	\newcommand{\awesome@uni}{#1}
 }
 
+\newcommand{\location}[1]{
+	\newcommand{\awesome@location}{#1}
+}
+
+\newcommand{\insertlocation}[0]{
+	\awesome@location
+}
+
 \newcommand{\insertuni}[0]{
-	\href{mailto:\awesome@uni}{\awesome@uni}
+	\awesome@uni
 }
 
 \tikzfading[
@@ -495,24 +503,33 @@
 
 \AtBeginSection[]{
 	\ifawesome@secslide
-		\begin{frame}[noframenumbering]
+		\begin{frame}[c, noframenumbering]
 			\thispagestyle{navigation@toc}
-			\vfill
 			\centering
 			\usebeamerfont{title}\usebeamercolor[fg]{section number projected}\insertsectionnumber.~\usebeamercolor[fg]{title}\insertsectionhead\par
-			\vfill
 		\end{frame}
 	\fi
 }
 
 \AtBeginSubsection[]{
 	\ifawesome@subsecslide
-		\begin{frame}[noframenumbering]
+		\begin{frame}[c, noframenumbering]
 			\thispagestyle{navigation@toc}
-			\vfill
 			\centering
 			\usebeamerfont{title}\usebeamercolor[fg]{section number projected}\insertsectionnumber.\textsubscript{\usebeamercolor[fg]{subsection number projected}\insertsubsectionnumber}~\usebeamercolor[fg]{title}\insertsubsectionhead\par
-			\vfill
 		\end{frame}
 	\fi
 }
+
+\AtEndDocument{
+	{\setbeamercolor{background canvas}{bg=awesomehighlight!70!black}
+	\begin{frame}[b, noframenumbering]
+		\color{white}
+		\thispagestyle{navigation@titlepage}
+		\Large\textbf{\insertauthor}
+		\vskip0.5em
+		\scriptsize\insertlocation,~\insertdate
+		\hfill
+		\insertemail
+	\end{frame}}
+}
diff --git a/example.pdf b/example.pdf
index 9099190..2439035 100644
Binary files a/example.pdf and b/example.pdf differ
diff --git a/example.tex b/example.tex
index 9836699..63c0bce 100644
--- a/example.tex
+++ b/example.tex
@@ -10,6 +10,7 @@
 \email{lukas.pietzschmann@uni-ulm.de}
 \institute{Institute of Software Engineering and\\Programming Languages}
 \uni{University of Ulm}
+\location{Ulm}
 \date{\today}
 \background{background.png}