diff --git a/setup/manageheader.php b/setup/manageheader.php
index a0b6d8eeb6..aa16fd0961 100644
--- a/setup/manageheader.php
+++ b/setup/manageheader.php
@@ -268,9 +268,9 @@ function show_header_form($validation_errors)
 	$supported_session_handler = array(
 		'egw_session_files' => lang('PHP session handler enabled in php.ini'),
 	);
-	if (!isset($supported_session_handler[$GLOBALS['egw_info']['server']['sessions_handler']]))
+	if ($GLOBALS['egw_info']['server']['session_handler'] && !isset($supported_session_handler[$GLOBALS['egw_info']['server']['session_handler']]))
 	{
-		$supported_session_handler[$GLOBALS['egw_info']['server']['sessions_handler']] = lang("Custom handler: %1",$GLOBALS['egw_info']['server']['sessions_handler']);
+		$supported_session_handler[$GLOBALS['egw_info']['server']['session_handler']] = lang("Custom handler: %1",$GLOBALS['egw_info']['server']['session_handler']);
 	}
 	$options = array();
 	foreach($supported_session_handler as $type => $label)
diff --git a/setup/templates/default/manageheader.tpl b/setup/templates/default/manageheader.tpl
index 57720c6c78..56f6b03713 100644
--- a/setup/templates/default/manageheader.tpl
+++ b/setup/templates/default/manageheader.tpl
@@ -61,7 +61,7 @@ function setDefaultDBPort(selectBox,portField)
 			</tr>
 			<tr class="row_off">
 				<td><strong>{lang_session}</strong><br />
-					<select name="setting[sessions_handler]">
+					<select name="setting[session_handler]">
 						{session_options}
 					</select>
 				</td>