diff --git a/400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs b/400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs
index a02ff79..728a7df 100644
--- a/400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs
+++ b/400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs
@@ -314,10 +314,10 @@ namespace AIAHTML5.API.Models
                 if (UserUtility.CheckIfPropertyExists(userInfo, "accountNumber") && !string.IsNullOrEmpty(userInfo["accountNumber"].ToString()))
                     emailMessage += "accountNumber: <b>" + userInfo["accountNumber"].ToString() + "</b><br/><br/>";
 
-                if (string.IsNullOrEmpty(sender))
+               // if (string.IsNullOrEmpty(sender))
                     senderEmailId = Convert.ToString(ConfigurationManager.AppSettings["SenderEmailAddress"]);
-                else
-                senderEmailId = sender;
+               // else
+               // senderEmailId = sender;
 
                 emailMessage += mailBody;
 
diff --git a/400-SOURCECODE/AIAHTML5.API/Models/Users.cs b/400-SOURCECODE/AIAHTML5.API/Models/Users.cs
index 652cf45..106800b 100644
--- a/400-SOURCECODE/AIAHTML5.API/Models/Users.cs
+++ b/400-SOURCECODE/AIAHTML5.API/Models/Users.cs
@@ -535,7 +535,10 @@ namespace AIAHTML5.API.Models
 
                                 intLicenseId = Convert.ToInt32(licRow["Id"]);
 
-
+                                User user = AIAHTML5.API.Models.DBModel.GetUserDetailsByEmailId(userInfo.EmailId);
+                                userInfo.LoginId = user.LoginId;
+                                userInfo.Password = user.Password;
+ 
                                 DataTable dtblEditionForModesty = new DBModel().GetEditionsForModesty(userInfo.LicenseId, 0);
                                 //This table result set should return always have 0 or 1 record if modesty mode is present.
                                 foreach (DataRow drEditionForModesty in dtblEditionForModesty.Rows)