diff --git a/application/core/UserIdentity.php b/application/core/UserIdentity.php
index 9241ac7d29a..4c75cef92b5 100644
--- a/application/core/UserIdentity.php
+++ b/application/core/UserIdentity.php
@@ -78,8 +78,9 @@ public function authenticate($sOneTimePassword='')
             $aUserMappings=Yii::app()->getConfig("auth_webserver_user_map");
             if (isset($aUserMappings[$sUser])) 
             {
-                $this->username = $sUser = $aUserMappings[$sUser];
+               $sUser = $aUserMappings[$sUser];
             }
+            $this->username = $sUser;
 
             $oUser=User::model()->findByAttributes(array('users_name'=>$sUser));
             if (is_null($oUser))