diff --git a/webui/config.php b/webui/config.php
index 5c290db8..93f522b7 100644
--- a/webui/config.php
+++ b/webui/config.php
@@ -58,6 +58,8 @@ $config['LDAP_DISTRIBUTIONLIST_ATTR'] = 'zimbraMailForwardingAddress';
 //$config['LDAP_DISTRIBUTIONLIST_ATTR'] = 'mail';
 
 
+// enable SSO against an Active Directory
+$config['ENABLE_SSO_LOGIN'] = 0;
 
 // enable authentication against an imap server (disabled by default)
 
@@ -147,6 +149,9 @@ $config['USE_EMAIL_AS_USERNAME'] = 1;
 $config['LDAP_IMPORT_MINIMUM_NUMBER_OF_USERS_TO_HEALTH_OK'] = 100;
 
 
+define('PILER_LOGIN_HELPER_PLACEHOLDER', 'PILER_COMMENT_FOR_PROPER_LOGIN_SO_THIS_CAN_BE_ANYTHING_JUST_BE_IT_SOMETHING_LIKE_A_UNIQUE_VALUE');
+
+
 $config['SIZE_X'] = 430;
 $config['SIZE_Y'] = 250;
 
diff --git a/webui/index.php b/webui/index.php
index 769e90f7..9b1bb8be 100644
--- a/webui/index.php
+++ b/webui/index.php
@@ -84,9 +84,14 @@ if(Registry::get('username')) {
    }
 }
 else {
-   if(ENABLE_GOOGLE_LOGIN == 1 && isset($request->get['route']) && $request->get['route'] == 'login/google') {
+   if(ENABLE_SSO_LOGIN == 1) {
+      header("Location: " . SITE_URL . 'sso.php');
+      exit;
+   }
+   else if(ENABLE_GOOGLE_LOGIN == 1 && isset($request->get['route']) && $request->get['route'] == 'login/google') {
       $action = new Router('login/google');
-   } else {
+   }
+   else {
       $action = new Router('login/login');
    }
 }
diff --git a/webui/view/javascript/piler-in.js b/webui/view/javascript/piler-in.js
index 5854fd42..422c7480 100644
--- a/webui/view/javascript/piler-in.js
+++ b/webui/view/javascript/piler-in.js
@@ -30,7 +30,7 @@ var Piler =
     /*
      * search data
      */
-    Searches:{},
+    Searches: {},
 
     /*
      * message meta ids
@@ -138,7 +138,13 @@ var Piler =
         })
         .done( function( a )// data, textStatus, jqXHR
         {
-            $('#mailcontframe').html( a );
+
+            if(a.indexOf('<?php print PILER_LOGIN_HELPER_PLACEHOLDER; ?>') > 0) {
+               document.location.href = '<?php print SITE_URL; ?>';
+               return true;
+            }
+
+            $('#mailcontframe').html(a);
             Piler.fill_current_messages_array();
             Piler.spinner('stop');
             $('#resultsheader').show();
@@ -244,6 +250,12 @@ var Piler =
 
         jQuery.ajax('/message.php/' + id, { cache: true })
         .done( function(a) {
+
+           if(a.indexOf('<?php print PILER_LOGIN_HELPER_PLACEHOLDER; ?>') > 0) {
+              document.location.href = '<?php print SITE_URL; ?>';
+              return true;
+           }
+
            $('#mailpreviewframe').html(a);
         })
         .fail(function(a, b) { alert("Problem retrieving XML data:" + b) });
diff --git a/webui/view/theme/default/templates/login/login.tpl b/webui/view/theme/default/templates/login/login.tpl
index 648b8904..fdff9b5e 100644
--- a/webui/view/theme/default/templates/login/login.tpl
+++ b/webui/view/theme/default/templates/login/login.tpl
@@ -51,5 +51,7 @@
 
 <?php } ?>
 
+<!-- <?php print PILER_LOGIN_HELPER_PLACEHOLDER; ?> -->
+
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/webui/view/theme/orig/templates/login/login.tpl b/webui/view/theme/orig/templates/login/login.tpl
index 84187ba7..815048aa 100644
--- a/webui/view/theme/orig/templates/login/login.tpl
+++ b/webui/view/theme/orig/templates/login/login.tpl
@@ -59,5 +59,7 @@
 
 </div>
 
+<!-- <?php print PILER_LOGIN_HELPER_PLACEHOLDER; ?> -->
+
 </body>
 </html>