diff --git a/lam/HISTORY b/lam/HISTORY
index 29dc2e00..3b0b367b 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -4,6 +4,7 @@ June 2015
   - Zarafa users: allow to change display format of "Send As"
   - User list: support to filter by account status
   - Lamdaemon: update group of home directory if user's primary group changes
+  - Personal: allow to add ou=addressbook subentry for users
   - LAM Pro:
    -> Password Self Reset: added 389 Directory Server schema file
 
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index fc691c42..c6d8ba8c 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <book>
-  <title>LDAP Account Manager - Manual</title>
+  <title>lamlamghfhlllLDAP Account Manager - Manual</title>
 
   <preface>
     <title>Overview</title>
@@ -17,7 +17,7 @@
     for account creation and use multiple configuration profiles.</para>
 
     <para><ulink
-    url="https://www.ldap-account-manager.org/">https://www.ldap-account-manager.org/</ulink></para>
+    url="https://www.ldap-account-manager.org/">sdfdsfdshttps://www.ldap-account-manager.org/</ulink></para>
 
     <para>Copyright (C) 2003 - 2014 Roland Gruber
     &lt;post@rolandgruber.de&gt;</para>
@@ -2291,7 +2291,9 @@ Have fun!
         all of them. You can hide fields in module settings.</para>
 
         <para>In advanced options you may also set fields to read-only (for
-        existing accounts) and define limits for photo files.</para>
+        existing accounts) and define limits for photo files. Additionally,
+        you can add an "ou=addressbook" subentry to each user in case you
+        manage user addressbooks.</para>
 
         <screenshot>
           <mediaobject>
diff --git a/lam/docs/manual-sources/images/mod_personal4.png b/lam/docs/manual-sources/images/mod_personal4.png
index 51cfe53f..ec6eb605 100644
Binary files a/lam/docs/manual-sources/images/mod_personal4.png and b/lam/docs/manual-sources/images/mod_personal4.png differ
diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc
index 5d110e26..f8ffa887 100644
--- a/lam/lib/modules/inetOrgPerson.inc
+++ b/lam/lib/modules/inetOrgPerson.inc
@@ -870,6 +870,10 @@ class inetOrgPerson extends baseModule implements passwordService {
 				"Headline" => _('Image cropping'),
 				"Text" => _('Uploaded images will be cropped to these maximum values.')
 			),
+			'addAddressbook' => array(
+				"Headline" => _('Add addressbook (ou=addressbook)'),
+				"Text" => _('Adds an "ou=addressbook" subentry to each user.')
+			),
 		);
 		return $return;
 	}
@@ -975,6 +979,41 @@ class inetOrgPerson extends baseModule implements passwordService {
 		}
 		return $return;
 	}
+	
+	/**
+	 * Runs the postmodify actions.
+	 * 
+	 * @see baseModule::postModifyActions()
+	 *
+	 * @param boolean $newAccount
+	 * @param array $attributes LDAP attributes of this entry
+	 * @return array array which contains status messages. Each entry is an array containing the status message parameters.
+	 */
+	public function postModifyActions($newAccount, $attributes) {
+		$messages = array();
+		// add address book
+		if ($this->isBooleanConfigOptionSet('inetOrgPerson_addAddressbook')) {
+			$dn = 'ou=addressbook,' . $this->getAccountContainer()->finalDN;
+			$result = ldapGetDN($dn);
+			if (empty($result)) {
+				$ldapUser = $_SESSION['ldap']->decrypt_login();
+				$ldapUser = $ldapUser[0];
+				$attrs = array(
+					'objectClass' => array('organizationalUnit'),
+					'ou' => 'addressbook'
+				);
+				$success = @ldap_add($_SESSION['ldap']->server(), $dn, $attrs);
+				if (!$success) {
+					logNewMessage(LOG_ERR, '[' . $ldapUser .'] Unable to add addressbook for user ' . $this->getAccountContainer()->finalDN . ' (' . ldap_error($_SESSION['ldap']->server()) . ').');
+					$messages[] = array('ERROR', sprintf(_("Was unable to create DN: %s."), htmlspecialchars($dn)), getDefaultLDAPErrorString($_SESSION['ldap']->server()));
+				}
+				else {
+					logNewMessage(LOG_NOTICE, '[' . $ldapUser .'] Added addressbook for user ' . $this->getAccountContainer()->finalDN);
+				}
+			}
+		}
+		return $messages;
+	}
 
 	/**
 	* Processes user input of the primary module page.
@@ -2434,32 +2473,45 @@ class inetOrgPerson extends baseModule implements passwordService {
 		if (!checkIfWriteAccessIsAllowed($this->get_scope())) {
 			die();
 		}
-		// mail sending is LAM Pro only
-		if (!isLAMProVersion()) {
-			return array (
-				'status' => 'finished',
-				'progress' => 100,
-				'errors' => array()
-			);
-		}
 		if (!isset($temp['counter'])) {
 			$temp['counter'] = 0;
 		}
 		$errors = array();
-		if (!in_array($temp['counter'], $failed) && isset($ids['inetOrgPerson_email']) && ($data[$temp['counter']][$ids['inetOrgPerson_email']] != "")) {
-			if (isset($ids['inetOrgPerson_sendPasswordMail']) && ($data[$temp['counter']][$ids['inetOrgPerson_sendPasswordMail']] == "true")
-					&& isset($accounts[$temp['counter']]['INFO.userPasswordClearText'])) {
-				$mailMessages = sendPasswordMail($accounts[$temp['counter']]['INFO.userPasswordClearText'], $accounts[$temp['counter']]);
-				for ($i = 0; $i < sizeof($mailMessages); $i++) {
-					if ($mailMessages[$i][0] == 'ERROR') {
-						$errors[] = $mailMessages[$i];
+		$dataSize = sizeof($data);
+		if (($temp['counter'] < $dataSize) && !in_array($temp['counter'], $failed)) {
+			// mail sending is LAM Pro only
+			if (isLAMProVersion()
+				&& isset($ids['inetOrgPerson_email'])
+				&& ($data[$temp['counter']][$ids['inetOrgPerson_email']] != "")) {
+				if (isset($ids['inetOrgPerson_sendPasswordMail']) && ($data[$temp['counter']][$ids['inetOrgPerson_sendPasswordMail']] == "true")
+						&& isset($accounts[$temp['counter']]['INFO.userPasswordClearText'])) {
+					$mailMessages = sendPasswordMail($accounts[$temp['counter']]['INFO.userPasswordClearText'], $accounts[$temp['counter']]);
+					for ($i = 0; $i < sizeof($mailMessages); $i++) {
+						if ($mailMessages[$i][0] == 'ERROR') {
+							$errors[] = $mailMessages[$i];
+						}
 					}
 				}
 			}
+			// add addressbook entry
+			if ($this->isBooleanConfigOptionSet('inetOrgPerson_addAddressbook')) {
+				$attrs = array(
+					'objectClass' => array('organizationalUnit'),
+					'ou' => 'addressbook'
+				);
+				$dn = 'ou=addressbook,' . $accounts[$temp['counter']]['dn'];
+				$success = @ldap_add($_SESSION['ldap']->server(), $dn, $attrs);
+				if (!$success) {
+					logNewMessage(LOG_ERR, 'Unable to add addressbook for user ' . $accounts[$temp['counter']]['dn'] . ' (' . ldap_error($_SESSION['ldap']->server()) . ').');
+					$messages[] = array('ERROR', sprintf(_("Was unable to create DN: %s."), htmlspecialchars($dn)), getDefaultLDAPErrorString($_SESSION['ldap']->server()));
+				}
+				else {
+					logNewMessage(LOG_NOTICE, 'Added addressbook for user ' . $accounts[$temp['counter']]['dn']);
+				}
+			}
 		}
 		$temp['counter']++;
-		$dataSize = sizeof($data);
-		if ($temp['counter'] < ($dataSize - 1)) {
+		if ($temp['counter'] < $dataSize) {
 			return array (
 				'status' => 'inProgress',
 				'progress' => ($temp['counter'] * 100) / $dataSize,
@@ -3780,6 +3832,9 @@ class inetOrgPerson extends baseModule implements passwordService {
 		}
 		$configContainer->addElement($configContainerOptions, true);
 		$advancedOptions = new htmlTable();
+		$addressbookTable = new htmlTable();
+		$addressbookTable->addElement(new htmlTableExtendedInputCheckbox('inetOrgPerson_addAddressbook', false, _('Add addressbook (ou=addressbook)'), 'addAddressbook'));
+		$advancedOptions->addElement($addressbookTable, true);
 		$advancedOptions->addElement(new htmlSubTitle(_('Read-only fields')), true);
 		$readOnlyOptions = array(
 			_('Description') => 'inetOrgPerson_readOnly_description', _('Street') => 'inetOrgPerson_readOnly_street',