diff --git a/lam/HISTORY b/lam/HISTORY
index 1b59080c..c056642c 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -8,6 +8,7 @@ March 2016 5.3
    -> autoload errors in tree view
   - LAM Pro:
    -> Support for LDAP views based on nsview object class
+   -> Password notification jobs support to print expiration date in email
 
 
 15.12.2015 5.2
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index 6a88adfb..b259e501 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -2076,6 +2076,11 @@ mysql> GRANT ALL PRIVILEGES ON lam_cron.* TO 'lam_cron'@'localhost';
           <para>You can enter LDAP attributes as wildcards in the form
           @@ATTRIBUTE_NAME@@. E.g. to add the user's common name use "@@cn@@".
           For the common name it would be "@@cn@@".</para>
+
+          <para>There are also two special wildcards for the expiration date.
+          @@EXPIRE_DATE_DDMMYYYY@@ will print the date as e.g. "31.12.2016".
+          @@EXPIRE_DATE_YYYYMMDD@@ will print the date as e.g.
+          "2016-12-31".</para>
         </section>
 
         <section>
@@ -2160,6 +2165,11 @@ mysql&gt; GRANT ALL PRIVILEGES ON lam_cron.* TO 'lam_cron'@'localhost';
           <para>You can enter LDAP attributes as wildcards in the form
           @@ATTRIBUTE_NAME@@. E.g. to add the user's common name use "@@cn@@".
           For the common name it would be "@@cn@@".</para>
+
+          <para>There are also two special wildcards for the expiration date.
+          @@EXPIRE_DATE_DDMMYYYY@@ will print the date as e.g. "31.12.2016".
+          @@EXPIRE_DATE_YYYYMMDD@@ will print the date as e.g.
+          "2016-12-31".</para>
         </section>
 
         <section>
@@ -2235,6 +2245,11 @@ mysql&gt; GRANT ALL PRIVILEGES ON lam_cron.* TO 'lam_cron'@'localhost';
           <para>You can enter LDAP attributes as wildcards in the form
           @@ATTRIBUTE_NAME@@. E.g. to add the user's common name use "@@cn@@".
           For the common name it would be "@@cn@@".</para>
+
+          <para>There are also two special wildcards for the expiration date.
+          @@EXPIRE_DATE_DDMMYYYY@@ will print the date as e.g. "31.12.2016".
+          @@EXPIRE_DATE_YYYYMMDD@@ will print the date as e.g.
+          "2016-12-31".</para>
         </section>
       </section>
 
diff --git a/lam/docs/manual-sources/style.css b/lam/docs/manual-sources/style.css
index f8ff4b51..607c7d93 100755
--- a/lam/docs/manual-sources/style.css
+++ b/lam/docs/manual-sources/style.css
@@ -2,7 +2,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2009  Roland Gruber
+  Copyright (C) 2009 - 2016  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -85,6 +85,8 @@ div.mediaobject img {
 
 h1 { color:#253aa3; }
 h2 { color:#000080; font-size:13pt; }
+h3 { color:#000080; }
+h4 { color:#000080; }
 
 div.nogrid table { 
  border-width:2px;
diff --git a/lam/lib/modules/shadowAccount.inc b/lam/lib/modules/shadowAccount.inc
index 72a34891..db79d58a 100644
--- a/lam/lib/modules/shadowAccount.inc
+++ b/lam/lib/modules/shadowAccount.inc
@@ -885,7 +885,7 @@ if (interface_exists('\LAM\JOB\Job', false)) {
 				return;
 			}
 			// send email
-			$success = $this->sendMail($options, $jobID, $user);
+			$success = $this->sendMail($options, $jobID, $user, $expireTime);
 			// update DB if mail was sent successfully
 			if ($success) {
 				$this->setDBLastPwdChangeTime($jobID, $pdo, $user['dn'], $user['shadowlastchange'][0]);
diff --git a/lam/lib/modules/windowsUser.inc b/lam/lib/modules/windowsUser.inc
index a747a1ce..e81d43b3 100644
--- a/lam/lib/modules/windowsUser.inc
+++ b/lam/lib/modules/windowsUser.inc
@@ -3300,7 +3300,7 @@ if (interface_exists('\LAM\JOB\Job', false)) {
 				return;
 			}
 			// send email
-			$success = $this->sendMail($options, $jobID, $user);
+			$success = $this->sendMail($options, $jobID, $user, $expireTime);
 			// update DB if mail was sent successfully
 			if ($success) {
 				$this->setDBLastPwdChangeTime($jobID, $pdo, $user['dn'], $user['pwdlastset'][0]);