diff --git a/application/core/plugins/Authwebserver/Authwebserver.php b/application/core/plugins/Authwebserver/Authwebserver.php
index a9dec35f477..1eb9d93b863 100644
--- a/application/core/plugins/Authwebserver/Authwebserver.php
+++ b/application/core/plugins/Authwebserver/Authwebserver.php
@@ -30,7 +30,11 @@ public function beforeLogin()
                 $sUser = $_SERVER['LOGON_USER'];
             }            
             if (strpos($sUser,"\\")!==false) {
+                // Get username for DOMAIN\USER
                 $sUser = substr($sUser, strrpos($sUser, "\\")+1);
+            } elseif (strpos($sUser,"@")!==false) {
+                // Get username for USER@DOMAIN
+                $sUser = substr($sUser, 0, strrpos($sUser, "@"));
             }
             
             $aUserMappings=$this->api->getConfigKey('auth_webserver_user_map', array());