diff --git a/lam/HISTORY b/lam/HISTORY
index b97e15be..28e123aa 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -8,6 +8,7 @@ March 2014 4.5
    -> Separate IP restriction list for self service
    -> Bind DLZ: support TXT/SRV records
    -> Self Service: added language selection
+   -> Custom fields: support help texts
   - fixed bugs:
    -> PDF export for multiple entries does not work
    -> Personal: fixed photo upload if Imagick is not installed
diff --git a/lam/lib/html.inc b/lam/lib/html.inc
index 2c48fe83..a7af1f92 100644
--- a/lam/lib/html.inc
+++ b/lam/lib/html.inc
@@ -813,7 +813,7 @@ class htmlHelpLink extends htmlElement {
 	 * @return array List of input field names and their type (name => type)
 	 */
 	function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
-		// overwrite module and scop if needed
+		// overwrite module and scope if needed
 		if ($this->module != null) {
 			$module = $this->module;
 		}
diff --git a/lam/lib/types/group.inc b/lam/lib/types/group.inc
index 8afee3f5..cc6beeac 100644
--- a/lam/lib/types/group.inc
+++ b/lam/lib/types/group.inc
@@ -110,9 +110,11 @@ class group extends baseType {
 			"roleOccupant" => _("Role member DNs"),
 			"description" => _("Group description")
 		);
-		$modules = $_SESSION['config']->get_AccountModules('group');
-		if (in_array('organizationalRole', $modules)) {
-			$return['cn'] = _('Role name');
+		if (!empty($_SESSION['config'])) {
+			$modules = $_SESSION['config']->get_AccountModules('group');
+			if (in_array('organizationalRole', $modules)) {
+				$return['cn'] = _('Role name');
+			}
 		}
 		return $return;
 	}