diff --git a/.gitattributes b/.gitattributes
index 66ac827e..bd05e298 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -286,6 +286,7 @@ bureau/admin/menu_quota.php -text
 bureau/admin/menu_sql.php -text
 bureau/admin/menu_web.php -text
 bureau/admin/mxlist.php -text
+bureau/admin/nowebmail.php -text
 bureau/admin/phpinfo.php -text
 bureau/admin/piwik_addaccount.php -text
 bureau/admin/piwik_addsites.php -text
@@ -318,8 +319,7 @@ bureau/admin/stats_members.php -text
 bureau/admin/styles/passwordStrengthMeter.css -text
 bureau/admin/styles/style.css -text
 bureau/admin/trash_dateselect.php -text
-bureau/admin/webmail/.htaccess -text
-bureau/admin/webmail/index.php -text
+bureau/admin/webmail-redirect.php -text
 bureau/class/config.php -text
 bureau/class/config_nochk.php -text
 bureau/class/config_real.php -text
diff --git a/bureau/admin/index.php b/bureau/admin/index.php
index 34140abe..ee6a3ee4 100644
--- a/bureau/admin/index.php
+++ b/bureau/admin/index.php
@@ -41,7 +41,7 @@ if (!$charset) $charset="UTF-8";
 
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <title>AlternC Desktop</title>
 <link rel="stylesheet" href="styles/style.css" type="text/css" />
@@ -83,19 +83,11 @@ if (!$_SERVER[HTTPS]) {
 </td></tr>
 <tr><td>
 
-<?php __("If you want to read your mail, enter your Email address and password in the following form and click 'Enter'"); ?>
-
+  <?php if (variable_get("webmail_redirect","")) { ?>
+<p><a href="/webmail"><?php __("If you want to read your mail, click here and enter your Email address and password in the next form, then click 'Enter'."); ?></a></p>
+ <?php } ?>
 </td><td>
 
-<form action="/webmail/src/redirect.php" method="post">
-<table border="0" style="border: 1px solid #202020;" cellspacing="0" cellpadding="3" width="300px" >
-<tr><th colspan="2" align="center"><?php __("Webmail Access"); ?></th></tr>
-<tr><th align="right"><label for="login_username"><?php __("Email Address"); ?></label></th><td><input type="text" class="int" name="login_username" id="login_username" value="" maxlength="128" size="15" /></td></tr>
-
-<tr><th align="right"><label for="secretkey"><?php __("Password"); ?></label></th><td><input type="password" class="int" name="secretkey" id="secretkey" value="" maxlength="128" size="15" /></td></tr>
-<tr><td colspan="2" align="center"><input type="submit" class="inb" name="submit" value="<?php __("Enter"); ?>" /> </td></tr>
-</table>
-</form>
 </td></tr>
 
 </table>
diff --git a/bureau/admin/nowebmail.php b/bureau/admin/nowebmail.php
new file mode 100644
index 00000000..58338b34
--- /dev/null
+++ b/bureau/admin/nowebmail.php
@@ -0,0 +1,31 @@
+<?php
+/*
+ ----------------------------------------------------------------------
+ AlternC - Web Hosting System
+ Copyright (C) 2000-2012 by the AlternC Development Team.
+ https://alternc.org/
+ ----------------------------------------------------------------------
+ LICENSE
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License (GPL)
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ To read the license please visit http://www.gnu.org/copyleft/gpl.html
+ ----------------------------------------------------------------------
+ Purpose of file: Show a message when there is no webmail configured
+ ----------------------------------------------------------------------
+*/
+
+require_once("../class/config.php");
+require_once("head.php");
+$error="_("There is currently no webmail configured. If you need one, contact your server administrator");
+
+include("index.php"); 
+
diff --git a/bureau/admin/webmail-redirect.php b/bureau/admin/webmail-redirect.php
new file mode 100644
index 00000000..fe174f23
--- /dev/null
+++ b/bureau/admin/webmail-redirect.php
@@ -0,0 +1,33 @@
+<?php
+/*
+ ----------------------------------------------------------------------
+ AlternC - Web Hosting System
+ Copyright (C) 2000-2012 by the AlternC Development Team.
+ https://alternc.org/
+ ----------------------------------------------------------------------
+ LICENSE
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License (GPL)
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ To read the license please visit http://www.gnu.org/copyleft/gpl.html
+ ----------------------------------------------------------------------
+ Purpose of file: listing of mail accounts for one domain.
+ ----------------------------------------------------------------------
+*/
+
+require_once("../class/config_nochk.php");
+
+if ($webmail=variable_get("webmail_redirect","")) {
+  header("Location: /$webmail");
+} else {
+  header("Location: /nowebmail.php"); 
+}
+
diff --git a/bureau/admin/webmail/.htaccess b/bureau/admin/webmail/.htaccess
deleted file mode 100644
index e69de29b..00000000
diff --git a/bureau/admin/webmail/index.php b/bureau/admin/webmail/index.php
deleted file mode 100644
index 2e024f9f..00000000
--- a/bureau/admin/webmail/index.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-header ("Location: /webmail/") ;
-?>
diff --git a/etc/alternc/templates/alternc/bureau.conf b/etc/alternc/templates/alternc/bureau.conf
index 3754466a..383a6654 100644
--- a/etc/alternc/templates/alternc/bureau.conf
+++ b/etc/alternc/templates/alternc/bureau.conf
@@ -8,6 +8,9 @@
   
   alias /alternc-sql      /usr/share/phpmyadmin
 
+  RewriteEngine On
+  RewriteRule ^webmail /webmail-redirect.php [L]
+
   # will be used to define aliases such as /javascript /webmail /squirrelmail ...
   Include /etc/alternc/apache-panel.d/*.conf
 
diff --git a/etc/alternc/templates/apache2/panel.conf b/etc/alternc/templates/apache2/panel.conf
index 9a3f77cc..256d05fe 100644
--- a/etc/alternc/templates/apache2/panel.conf
+++ b/etc/alternc/templates/apache2/panel.conf
@@ -8,7 +8,10 @@
   
   alias /alternc-sql      /usr/share/phpmyadmin
 
-  # will be used to define aliases such as /javascript /webmail /squirrelmail ...
+  RewriteEngine On
+  RewriteRule ^webmail /webmail-redirect.php [L]
+
+  # will be used to define aliases such as /javascript /squirrelmail ...
   Include /etc/alternc/apache-panel.d/*.conf
 
 </VirtualHost>
diff --git a/squirrelmail/squirrelmail-install b/squirrelmail/squirrelmail-install
index 308b3c13..fb8e7456 100644
--- a/squirrelmail/squirrelmail-install
+++ b/squirrelmail/squirrelmail-install
@@ -28,6 +28,14 @@ then
     cp -f /etc/alternc/templates/squirrelmail/avelsieve-config.php /etc/alternc/templates/squirrelmail/apache.conf /etc/squirrelmail/
     cp -f /etc/alternc/templates/javascript-common/javascript-common.conf /etc/javascript-common/
     echo "Done"
+    
+    . /usr/lib/alternc/functions.sh
+    
+    echo "Setting squirrelmail as default webmail"
+    mysql_query "REPLACE INTO variable SET name='webmail_redirect', value='squirrelmail', comment='Set it to the name of your preferred webmail, /webmail will point to it';"
+    echo "Done"
+    
 fi
 
 
+
