diff --git a/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj b/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj
index 03d20b1..7ecef71 100644
--- a/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj
+++ b/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj
@@ -155,7 +155,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>63874</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:95/AIA/API</IISUrl>
+          <IISUrl>http://localhost:85/AIA/API</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>http://182.19.10.91/AIAHTML5</CustomServerUrl>
diff --git a/400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs b/400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
index 987885b..74bd9d8 100644
--- a/400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
+++ b/400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
@@ -28,19 +28,11 @@ namespace AIAHTML5.API.Controllers
         public HttpResponseMessage Post([FromBody]JObject credentials)
 
         {
-           // log4net.Config.XmlConfigurator.Configure();
-
             ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType));
             logger.Debug("inside POST");
+           
             dynamic userDetails = AIAHTML5.API.Models.Users.AuthenticateUser(credentials);
-
-
-            //JsonSerializerSettings settings = new JsonSerializerSettings()
-            //{
-            //    ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Serialize,
-            //    DateFormatHandling = DateFormatHandling.IsoDateFormat,
-            //};
-
+      
             return new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(userDetails)) };
 
         }
diff --git a/400-SOURCECODE/AIAHTML5.API/Models/Users.cs b/400-SOURCECODE/AIAHTML5.API/Models/Users.cs
index b8a45ba..640dea9 100644
--- a/400-SOURCECODE/AIAHTML5.API/Models/Users.cs
+++ b/400-SOURCECODE/AIAHTML5.API/Models/Users.cs
@@ -25,34 +25,29 @@ namespace AIAHTML5.API.Models
 
                 var collection = db.GetCollection<dynamic>("Users");
 
-                // var builder = Builders<BsonDocument>.Filter;
-                BsonDocument filter = new BsonDocument();
-                filter.Add("loginId", credentials["username"].ToString());
-                filter.Add("password", credentials["password"].ToString());
-
-
                 FilterDefinition<dynamic>[] filterCondition = { Builders<dynamic>.Filter.Eq("loginId", credentials["username"].ToString()),
                                                             Builders<dynamic>.Filter.Eq("password", credentials["password"].ToString())};
 
                 dynamic userDetails = collection.Find(Builders<dynamic>.Filter.And(filterCondition)).SingleOrDefault();
                    
-                //logger.Debug("userDetails= " + userDetails.ElementCount);
-                //if (userDetails.ElementCount > 0)
-                //{
+               
+                if (userDetails!= null)
+                {
+                    logger.Debug("userDetails.loginId= " + userDetails.loginId);
                     return userDetails;
-                //}
-                //else
-                //{
-                //    return AIAConstants.USER_NOT_FOUND;
-                //}
+                }
+                else
+                {
+                    return AIAConstants.USER_NOT_FOUND;
+                }
             }
             catch(Exception e)
             {
-                //NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
+                
                 logger.Fatal("Exception in AuthenticateUser for loginId =" + credentials["username"].ToString() + " and password= " + credentials["password"].ToString() + "Exception= " + e.Message);
                
-                string error = AIAConstants.ERROR_IN_FECTHING_DETAILS;
-                return error;
+                string errorMessage = AIAConstants.ERROR_IN_FECTHING_DETAILS;
+                return errorMessage;
             }
 
         }