diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 4e548249092..b8001f874d1 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -143,6 +143,7 @@ CurrentInformationOnImage=This tool was designed to help you to resize or crop a
 ImageEditor=Image editor
 YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
 YouReceiveMailBecauseOfNotification2=This event is the following:
+ThisIsListOfModules=This is list of standard modules preselected by this demo profile. Edit this to have a more personalized demo and click on "Start".
 
 ##### Bookmark #####
 Bookmark=Bookmark
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 91d60f20249..d06bb307593 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -143,6 +143,7 @@ CurrentInformationOnImage=Cette page permet de redimensionner ou recadrer un ima
 ImageEditor=Editeur d'image
 YouReceiveMailBecauseOfNotification=Vous recevez ce message car votre email a été abonnée à certaines notifications automatiques pour vous informer d'évenements particuliers issus du logiciel %s de %s.
 YouReceiveMailBecauseOfNotification2=L'événement en question est le suivant:
+ThisIsListOfModules=Voici la liste des modules standards présélectionnés par ce profil de démo. Affinez encore vos préférences et cliquez sur "Démarrer".
 
 ##### Bookmark #####
 Bookmark=Marque-page
diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index 2a941c3a3ed..968c9c78eaf 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -51,7 +51,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 
 	$php_self = $_SERVER['PHP_SELF'];
 	$php_self.= $_SERVER["QUERY_STRING"]?'?'.$_SERVER["QUERY_STRING"]:'';
-	
+
 	// Title
 	$title='Dolibarr '.DOL_VERSION;
 	if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE;
@@ -78,7 +78,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 
 	$conf->css = "/theme/".$conf->theme."/style.css.php?lang=".$langs->defaultlang;
 	$conf_css = DOL_URL_ROOT.$conf->css;
-	
+
 	// Add real path in session name
 	$realpath='';
 	if ( preg_match('/^([^.]+)\/htdocs\//i', realpath($_SERVER["SCRIPT_FILENAME"]), $regs))	$realpath = isset($regs[1])?$regs[1]:'';
@@ -87,10 +87,10 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	$sessiontimeout='DOLSESSTIMEOUT_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].$realpath);
 	if (! empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", '', 0);
 
-	if (! empty($_REQUEST["urlfrom"])) $_SESSION["urlfrom"]=$_REQUEST["urlfrom"];
+	if (GETPOST("urlfrom")) $_SESSION["urlfrom"]=GETPOST("urlfrom");
 	else unset($_SESSION["urlfrom"]);
 
-	if (! $_REQUEST["username"]) $focus_element='username';
+	if (GETPOST("username")) $focus_element='username';
 	else $focus_element='password';
 
 	$login_background=DOL_URL_ROOT.'/theme/login_background.png';
@@ -131,7 +131,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	}
 
 	// Login
-	$login = (!empty($lastuser)?$lastuser:(isset($_REQUEST["username"])?$_REQUEST["username"]:$demologin));
+	$login = (!empty($lastuser)?$lastuser:(GETPOST("username")?GETPOST("username"):$demologin));
 	$password = $demopassword;
 
 	// Show logo (search in order: small company logo, large company logo, theme logo, common logo)
@@ -158,7 +158,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY))
 	{
 		$rowspan++;
-		
+
 		$res=@include_once(DOL_DOCUMENT_ROOT.'/multicompany/class/actions_multicompany.class.php');
 		if ($res)
 		{
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index fbb87ba83f3..deb0be59704 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -41,25 +41,28 @@ if (empty($dolibarr_main_demo)) accessforbidden('Parameter dolibarr_main_demo mu
 
 $demoprofiles=array(
 	array('default'=>'-1', 'key'=>'profdemofun','label'=>'DemoFundation',
-	'disablemodules'=>'banque,barcode,boutique,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,facture,ficheinter,fournisseur,prelevement,produit,projet,propal,propale,service,societe,stock,tax',
+	'disablemodules'=>'banque,barcode,boutique,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,facture,ficheinter,fournisseur,prelevement,produit,projet,propal,propale,service,societe,stock,tax',
 	'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png'),
 	array('default'=>'0', 'key'=>'profdemofun2','label'=>'DemoFundation2',
-	'disablemodules'=>'barcode,boutique,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,facture,ficheinter,fournisseur,prelevement,produit,projet,propal,propale,service,societe,stock',
+	'disablemodules'=>'barcode,boutique,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,facture,ficheinter,fournisseur,prelevement,produit,projet,propal,propale,service,societe,stock',
 	'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png'),
 	array('default'=>'1', 'key'=>'profdemoservonly','label'=>'DemoCompanyServiceOnly',
-	'disablemodules'=>'adherent,barcode,boutique,cashdesk,don,expedition,prelevement,projet,stock',
+	'disablemodules'=>'adherent,barcode,boutique,cashdesk,don,expedition,externalsite,prelevement,stock',
 	'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot8.png'),
 	array('default'=>'-1','key'=>'profdemoshopwithdesk','label'=>'DemoCompanyShopWithCashDesk',
-	'disablemodules'=>'adherent,boutique,don,ficheinter,prelevement,produit,stock',
+	'disablemodules'=>'adherent,boutique,don,externalsite,ficheinter,prelevement,produit,stock',
 	'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png'),
 	array('default'=>'0', 'key'=>'profdemoprodstock','label'=>'DemoCompanyProductAndStocks',
-	'disablemodules'=>'adherent,boutique,cashdesk,don,ficheinter,prelevement,service',
+	'disablemodules'=>'adherent,boutique,don,externalsite,ficheinter,prelevement,service',
 	'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png'),
 	array('default'=>'0', 'key'=>'profdemoall','label'=>'DemoCompanyAll',
-	'disablemodules'=>'adherent,boutique,cashdesk,don',
+	'disablemodules'=>'adherent,boutique,don,externalsite',
 	'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'),
 	);
 
+$alwaysdisabledmodules=array('memcached');
+//$alwaysdisabledmodules=array('boutique','clicktodial','externalsite','ftp','gravatar','ldap','memcached','webcalendar');
+
 
 function llxHeaderVierge($title, $head = "")
 {
@@ -77,6 +80,10 @@ function llxHeaderVierge($title, $head = "")
 	print '<meta name="description" content="Dolibarr simple ERP/CRM demo. You can test here several profiles of Dolibarr ERP/CRM demos.">'."\n";
 	print "<title>".$title."</title>\n";
 	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php?lang='.$langs->defaultlang.'">'."\n";
+    print '<!-- Includes for JQuery -->'."\n";
+    print '<script type="text/javascript" src="/includes/jquery/js/jquery-1.4.2.min.js"></script>'."\n";
+    print '<script type="text/javascript" src="/includes/jquery/js/jquery-ui-1.8.4.custom.min.js"></script>'."\n";
+    print '<script type="text/javascript" src="/includes/jquery/js/jquery.tablednd_0_5.js"></script>'."\n";
 	if ($head) print $head."\n";
 	print '<style type="text/css">';
 	print '.CTableRow1      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #e6E6eE; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
@@ -98,23 +105,36 @@ function llxFooterVierge()
  * Actions
  */
 
-if ($_REQUEST["action"] == 'gotodemo')
+if (GETPOST("action") == 'gotodemo')
 {
-	//print 'ee'.$_POST["demochoice"];
+	//print 'ee'.GETPOST("demochoice");
 	$disablestring='';
-	foreach ($demoprofiles as $profilearray)
+	// If we disable modules using a profile choice
+	if (GETPOST("demochoice"))
 	{
-		if ($profilearray['key'] == $_REQUEST["demochoice"])
-		{
-			$disablestring=$profilearray['disablemodules'];
-			break;
-		}
+    	foreach ($demoprofiles as $profilearray)
+    	{
+    		if ($profilearray['key'] == GETPOST("demochoice"))
+    		{
+    			$disablestring=$profilearray['disablemodules'];
+    			break;
+    		}
+    	}
+	}
+	// If we disable modules using list
+	foreach($_POST as $key => $val)
+	{
+	    if ($val == '1')
+	    {
+	        $disablestring.=$key.',';
+	    }
+
 	}
 
 	if ($disablestring)
 	{
 		$url=DOL_URL_ROOT.'/index.php?disablemodules='.$disablestring;
-		if (! empty($_REQUEST["urlfrom"]))     $url.='&urlfrom='.$_REQUEST["urlfrom"];
+		if (GETPOST("urlfrom")) $url.='&urlfrom='.GETPOST("urlfrom");
 		header("Location: ".$url);
 		exit;
 	}
@@ -196,6 +216,31 @@ foreach ($dirlist as $dirroot)
 asort($orders);
 //var_dump($orders);
 
+
+?>
+<script type="text/javascript" language="javascript">
+var openedId='';
+jQuery(document).ready(function () {
+    jQuery('tr.moduleline').hide();
+    // Enable this to allow personalized setup
+/*    jQuery('.modulelineshow').attr('href','#');
+    jQuery(".modulelineshow").click(function() {
+        var currentId = $(this).attr('id').substring(2);
+        jQuery('tr.moduleline').hide();
+        if (currentId != openedId)
+        {
+            openedId=currentId;
+            jQuery("#tr1"+currentId).show();
+            jQuery("#tr2"+currentId).show();
+        }
+        else openedId = '';
+    });
+*/
+});
+</script>
+<?php
+
+
 print '<form name="choosedemo" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="username" value="demo">';
@@ -214,25 +259,54 @@ print '<font color="#555577"><b>'.$langs->trans("ChooseYourDemoProfil").'</b></f
 print '</td></tr>';
 print '<tr><td width="50%">';
 
-$NBOFCOLS=2;
 print '<table style="font-size:14px;" width="100%" summary="List of Dolibarr demos">'."\n";
 $i=0;
 foreach ($demoprofiles as $profilarray)
 {
 	if ($profilarray['default'] >= 0)
 	{
-		$url=$_SERVER["PHP_SELF"].'?action=gotodemo&amp;demochoice='.$profilarray['key'].'&amp;urlfrom='.urlencode($_SERVER["PHP_SELF"]);
+		$url=$_SERVER["PHP_SELF"].'?action=gotodemo&amp;urlfrom='.urlencode($_SERVER["PHP_SELF"]);
+		$urlwithmod=$url.'&amp;demochoice='.$profilarray['key'];
 		//if ($i % $NBOFCOLS == 0) print '<tr>';
 		print '<tr>';
-		print '<td>';
+		print '<td>'."\n";
+
+		print '<form method="POST" name="form'.$profilarray['key'].'" action="'.$_SERVER["PHP_SELF"].'">';
+		print '<input type="hidden" name="action" value="gotodemo">';
+        print '<input type="hidden" name="urlfrom" value="'.urlencode($_SERVER["PHP_SELF"]).'">';
 		print '<table summary="Dolibarr online demonstration for profile '.$profilarray['label'].'" style="font-size:14px;" width="100%" class="CTableRow'.($i%2==0?'1':'2').'">'."\n";
 		print '<tr>';
-		print '<td width="50"><a href="'.$url.'"><img src="'.$profilarray['icon'].'" width="48" border="0" alt="Demo '.$profilarray['label'].'"></a></td>';
+		print '<td width="50"><a href="'.$urlwithmod.'" id="a1'.$profilarray['key'].'" class="modulelineshow"><img src="'.$profilarray['icon'].'" width="48" border="0" alt="Demo '.$profilarray['label'].'"></a></td>';
 		//print '<td><input type="radio" name="demochoice"';
 		//if ($profilarray['default']) print ' checked="true"';
 		//print ' value="'.$profilarray['key'].'"></td>';
-		print '<td><a href="'.$url.'">'.$langs->trans($profilarray['label']).'</a></td></tr>';
+		print '<td><a href="'.$urlwithmod.'" id="a2'.$profilarray['key'].'" class="modulelineshow">'.$langs->trans($profilarray['label']).'</a></td></tr>'."\n";
+
+		print '<tr id="tr1'.$profilarray['key'].'" class="moduleline">';
+		print '<td colspan="2">';
+		print $langs->trans("ThisIsListOfModules").'<br>';
+		print '<table>';
+		$listofdisabledmodules=explode(',',$profilarray['disablemodules']);
+		$j=0;$nbcolsmod=4;
+		foreach($modules as $val) // Loop on qualified (enabled) modules
+		{
+		    $modulekeyname=strtolower($val->name);
+		    $modulo=($j % $nbcolsmod);
+		    if ($modulo == 0) print '<tr>';
+            print '<td><input type="checkbox" class="checkbox" name="'.$modulekeyname.'" value="1"';
+            if (! in_array($modulekeyname,$listofdisabledmodules)) print ' checked="true"';
+            if (! empty($val->always_enabled) || in_array($modulekeyname,$alwaysdisabledmodules)) print ' disabled="true"';
+            print '>'.$val->getName().' &nbsp;</td>';
+            if ($modulo == ($nbcolsmod - 1)) print '</tr>';
+            $j++;
+		}
 		print '</table>';
+		print '</td>';
+		print '</tr>'."\n";
+
+		print '<tr id="tr2'.$profilarray['key'].'" class="moduleline"><td colspan="'.$nbcolsmod.'" align="center"><input type="submit" value=" &nbsp; &nbsp; '.$langs->trans("Start").' &nbsp; &nbsp; " class="button"></td></tr>';
+		print '</table></form>'."\n";
+
 		print '</td>';
 		//if ($i % $NBOFCOLS == ($NBOFCOLS-1)) print '</tr>'."\n";
 		print '</tr>'."\n";
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 8f73872837c..ceeefb57ce4 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -81,14 +81,6 @@ body {
 
 a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: bold; color: #000000; text-decoration: none; }
 
-input {
-	font-size: <?php print $fontsize ?>px;
-	font-family: <?php print $fontlist ?>;
-    background: #FDFDFD;
-    border: 1px solid #ACBCBB;
-    padding: 0px 0px 0px 0px;
-    margin: 0px 0px 0px 0px;
-}
 input.flat {
 	font-size: <?php print $fontsize ?>px;
 	font-family: <?php print $fontlist ?>;
@@ -124,7 +116,8 @@ select.flat {
 }
 .button {
     font-family: <?php print $fontlist ?>;
-	border: 0px;
+	border: 1px solid #ACBCBB;
+/*    border: 0px; */
 	background-image: url(<?php echo DOL_URL_ROOT.'/theme/auguria/img/button_bg.png' ?>);
 	background-position: bottom;
     padding: 0px 2px 0px 2px;
@@ -133,7 +126,8 @@ select.flat {
 .button:focus  {
     font-family: <?php print $fontlist ?>;
 	color: #222244;
-	border: 0px;
+    border: 1px solid #ACBCBB;
+/*    border: 0px; */
 	background-image: url(<?php echo DOL_URL_ROOT.'/theme/auguria/img/button_bg.png' ?>);
 	background-position: bottom;
     padding: 0px 2px 0px 2px;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 8c3a6340ff5..892841cd46d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -84,14 +84,6 @@ body {
 
 a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: bold; color: #000000; text-decoration: none; }
 
-input {
-	font-size: <?php print $fontsize ?>px;
-	font-family: <?php print $fontlist ?>;
-    background: #FDFDFD;
-    border: 1px solid #ACBCBB;
-    padding: 0px 0px 0px 0px;
-    margin: 0px 0px 0px 0px;
-}
 input.flat {
 	font-size: <?php print $fontsize ?>px;
 	font-family: <?php print $fontlist ?>;
@@ -127,18 +119,18 @@ select.flat {
 }
 .button {
     font-family: <?php print $fontlist ?>;
-	border: 0px;
 	background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/button_bg.png' ?>);
 	background-position: bottom;
+    border: 1px solid #ACBCBB;
     padding: 0px 2px 0px 2px;
     margin: 0px 0px 0px 0px;
 }
 .button:focus  {
     font-family: <?php print $fontlist ?>;
 	color: #222244;
-	border: 0px;
 	background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/button_bg.png' ?>);
 	background-position: bottom;
+    border: 1px solid #ACBCBB;
     padding: 0px 2px 0px 2px;
     margin: 0px 0px 0px 0px;
 }
diff --git a/htdocs/theme/freelug/style.css.php b/htdocs/theme/freelug/style.css.php
index dc1fb79f2d0..9893f6f9694 100644
--- a/htdocs/theme/freelug/style.css.php
+++ b/htdocs/theme/freelug/style.css.php
@@ -79,15 +79,6 @@ a:link    { font-family: helvetica, verdana, arial, sans-serif; font-weight: bol
 a:visited { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; }
 a:active  { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; }
 a:hover   { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: underline; }
-input
-{
-	font-size: <?php print empty($conf->browser->phone)?'12':'9'; ?>px;
-    font-family: helvetica, verdana, arial, sans-serif;
-    background: #FFFFFF;
-    border: 1px solid #8C9C9B;
-    padding: 0px 0px 0px 0px;
-    margin: 0px 0px 0px 0px;
-}
 input.flat
 {
 	font-size: <?php print empty($conf->browser->phone)?'12':'9'; ?>px;
diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php
index b61e4ffa981..7a0881f530b 100644
--- a/htdocs/theme/yellow/style.css.php
+++ b/htdocs/theme/yellow/style.css.php
@@ -77,14 +77,6 @@ a:link    { font-family: helvetica, verdana, arial, sans-serif; font-weight: bol
 a:visited { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; }
 a:active  { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; }
 a:hover   { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: underline; }
-input
-{
-	font-size: 12px;
-    font-family: helvetica, verdana, arial, sans-serif;
-    border: 1px solid #cccccc;
-    padding: 0px 0px 0px 0px;
-    margin: 0px 0px 0px 0px;
-}
 input.flat
 {
 	font-size: 12px;