diff --git a/lam/templates/config/conflogin.php b/lam/templates/config/conflogin.php
index 151e9f53..f029b935 100644
--- a/lam/templates/config/conflogin.php
+++ b/lam/templates/config/conflogin.php
@@ -54,7 +54,6 @@ unset($_SESSION['conf_maxlistentries']);
 unset($_SESSION['conf_lang']);
 unset($_SESSION['conf_scriptpath']);
 unset($_SESSION['conf_scriptserver']);
-unset($_SESSION['conf_samba3']);
 unset($_SESSION['conf_pwdhash']);
 unset($_SESSION['conf_filename']);
 
diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php
index 60ee26e3..9ddb5c28 100644
--- a/lam/templates/config/confmain.php
+++ b/lam/templates/config/confmain.php
@@ -58,7 +58,6 @@ if ($_POST['back'] || $_POST['submitconf'] || $_POST['editmodules']){
 		$_SESSION['conf_hstlstattr'] = $_POST['hstlstattr'];
 		$_SESSION['conf_maxlistentries'] = $_POST['maxlistentries'];
 		$_SESSION['conf_lang'] = $_POST['lang'];
-		$_SESSION['conf_samba3'] = $_POST['samba3'];
 		$_SESSION['conf_pwdhash'] = $_POST['pwdhash'];
 		$_SESSION['conf_scriptpath'] = $_POST['scriptpath'];
 		$_SESSION['conf_scriptserver'] = $_POST['scriptserver'];
@@ -111,7 +110,6 @@ if (!(($conf->get_Passwd()) == $passwd)) {
 // check if user comes from modules page
 if ($_GET["modulesback"] == "true") {
 	// load config values from session
-	$conf->set_samba3($_SESSION['conf_samba3']);
 	$conf->set_ServerURL($_SESSION['conf_serverurl']);
 	$conf->set_cacheTimeout($_SESSION['conf_cachetimeout']);
 	$conf->set_Adminstring($_SESSION['conf_admins']);
@@ -240,22 +238,6 @@ echo ("</fieldset>");
 
 echo ("<p></p>");
 
-echo ("<fieldset><legend><b>" . _("Samba settings") . "</b></legend>");
-echo ("<table border=0>");
-
-// Samba version
-echo ("<tr><td align=\"right\"><b>".
-	_("Manage Samba 3 accounts") . ": </b></td><td><select name=\"samba3\">\n");
-if ($conf->is_samba3()) echo ("<option value=\"yes\">" . _("yes") . "</option>
-	<option value=\"no\">" . _("no") . "</option></select></td>");
-else echo ("<option>no</option><option>yes</option></select></td>");
-echo ("<td><a href=\"../help.php?HelpNumber=213\" target=\"lamhelp\">" . _("Help") . "</a></td></tr>\n");
-
-echo ("</table>");
-echo ("</fieldset>");
-
-echo ("<p></p>");
-
 echo ("<fieldset><legend><b>" . _("Ranges") . "</b></legend>");
 echo ("<table border=0>");
 
diff --git a/lam/templates/config/confsave.php b/lam/templates/config/confsave.php
index 9b0c9ef1..76dca9fd 100644
--- a/lam/templates/config/confsave.php
+++ b/lam/templates/config/confsave.php
@@ -57,7 +57,6 @@ $maxlistentries = $_SESSION['conf_maxlistentries'];
 $lang = $_SESSION['conf_lang'];
 $scriptpath = $_SESSION['conf_scriptpath'];
 $scriptserver = $_SESSION['conf_scriptserver'];
-$samba3 = $_SESSION['conf_samba3'];
 $pwdhash = $_SESSION['conf_pwdhash'];
 $pdftext = $_SESSION['conf_pdf_usertext'];
 $filename = $_SESSION['conf_filename'];
@@ -79,12 +78,6 @@ echo ("<p align=\"center\"><a href=\"http://lam.sf.net\" target=\"new_window\">"
 	"<img src=\"../../graphics/banner.jpg\" border=1 alt=\"LDAP Account Manager\"></a></p><hr><br><br>");
 
 // check new preferences
-if (!$conf->set_samba3($samba3)) {
-	echo ("<font color=\"red\"><b>" . _("Samba version is not defined!") . "</b></font>");
-	echo ("\n<br><br><br><a href=\"javascript:history.back()\">" . _("Back to preferences...") . "</a>");
-	exit;
-}
-
 if (!$conf->set_ServerURL($serverurl)) {
 	echo ("<font color=\"red\"><b>" . _("Server Address is empty!") . "</b></font>");
 	echo ("\n<br><br><br><a href=\"javascript:history.back()\">" . _("Back to preferences...") . "</a>");
@@ -265,7 +258,6 @@ unset($_SESSION['conf_maxlistentries']);
 unset($_SESSION['conf_lang']);
 unset($_SESSION['conf_scriptpath']);
 unset($_SESSION['conf_scriptserver']);
-unset($_SESSION['conf_samba3']);
 unset($_SESSION['conf_pwdhash']);
 unset($_SESSION['conf_pdf_usertext']);
 unset($_SESSION['conf_filename']);