diff --git a/kiss/emailvpn/handout_email_und_vpn.pdf b/kiss/emailvpn/handout_email_und_vpn.pdf
index 360e85b125bb6f93188c04ca3300b47504faa8ab..03e42fb31d09b73f72357335b6507a6b3760fcd7 100644
Binary files a/kiss/emailvpn/handout_email_und_vpn.pdf and b/kiss/emailvpn/handout_email_und_vpn.pdf differ
diff --git a/kiss/emailvpn/handout_email_und_vpn.tex b/kiss/emailvpn/handout_email_und_vpn.tex
index bfe0f8709947566e06f97c288c6f0697d72bff63..3f619b3ff0893dc09b9f7f8b3e8e6540398712fd 100644
--- a/kiss/emailvpn/handout_email_und_vpn.tex
+++ b/kiss/emailvpn/handout_email_und_vpn.tex
@@ -14,7 +14,7 @@
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0.4pt}
 \fancyhead{}
-\fancyfoot[L]{KISS WS1314}
+\fancyfoot[L]{KISS SS2014}
 \fancyfoot[C]{}
 \fancyfoot[R]{Daniel Schulte (daniel.schulte@rwth-aachen.de)}
 \newcommand{\litem}{\item[--]}
@@ -33,14 +33,14 @@
 	\begin{itemize}
 		\litem Imap-Server:
 			\begin{itemize}
-				\litem Server: \texttt{mailbox.rwth-aachen.de}
+				\litem Server: \texttt{mail.rwth-aachen.de}
 				\litem Port: 993
 				\litem Protokoll: SSL
 				\litem Authentifizierung: \enquote{Passwort, normal}
 			\end{itemize}
 		\litem SMTP-Server:
 		\begin{itemize}
-			\litem Server: \texttt{relay-auth.rwth-aachen.de}
+			\litem Server: \texttt{mail.rwth-aachen.de}
 			\litem Port: 587
 			\litem Protokoll: \texttt{STARTTLS}
 			\litem Authentifizierung: \enquote{Passwort, normal}
diff --git a/kiss/emailvpn/handout_email_und_vpn_en.pdf b/kiss/emailvpn/handout_email_und_vpn_en.pdf
index da37d2c7d648b5030e96f8e24c565f70dbdbe6e4..17691844c7a40184b5deaf74480260e52adb70d3 100644
Binary files a/kiss/emailvpn/handout_email_und_vpn_en.pdf and b/kiss/emailvpn/handout_email_und_vpn_en.pdf differ
diff --git a/kiss/emailvpn/handout_email_und_vpn_en.tex b/kiss/emailvpn/handout_email_und_vpn_en.tex
index 478b47050c127c476e41edcd943ee61fed31c90d..dc259709aa476c2bfce2b73c8cb9711c2d3c6d50 100644
--- a/kiss/emailvpn/handout_email_und_vpn_en.tex
+++ b/kiss/emailvpn/handout_email_und_vpn_en.tex
@@ -14,7 +14,7 @@
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0.4pt}
 \fancyhead{}
-\fancyfoot[L]{KISS WS1314}
+\fancyfoot[L]{KISS SS2014}
 \fancyfoot[C]{}
 \fancyfoot[R]{Daniel Schulte (daniel.schulte@rwth-aachen.de)}
 \newcommand{\litem}{\item[--]}
@@ -26,21 +26,21 @@
 \begin{itemize}
 	\litem To get Thunderbird to properly talk to the RWTH-servers you need credentials:
 	\begin{itemize}
-		\litem Username: \texttt{<timkennung>+rwth-aachen.de} e.G. \texttt{mm123456+rwth-aachen.de}
+		\litem Username: \texttt{<tim\_id>+rwth-aachen.de} e.G. \texttt{mm123456+rwth-aachen.de}
 		\litem Password: \texttt{Your Password} (if you didn't change it it is the same as for eduroam)
 	\end{itemize}
 	\litem Thunderbird has a database with server settings for the most common email providers. Unfortunately the RWTH isn't in that list so you have to enter the data yourself:
 	\begin{itemize}
 		\litem Imap-Server:
 			\begin{itemize}
-				\litem Server: \texttt{mailbox.rwth-aachen.de}
+				\litem Server: \texttt{mail.rwth-aachen.de}
 				\litem Port: 993
 				\litem Protocoll: SSL
 				\litem Authentication: \enquote{Password, normal}
 			\end{itemize}
 		\litem SMTP-Server:
 		\begin{itemize}
-			\litem Server: \texttt{relay-auth.rwth-aachen.de}
+			\litem Server: \texttt{mail.rwth-aachen.de}
 			\litem Port: 587
 			\litem Protokoll: \texttt{STARTTLS}
 			\litem Authentication: \enquote{Password, normal}