diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
index ca03c37..3c4b171 100644
--- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
+++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
@@ -37,8 +37,8 @@
     <add key="SMTPAddress" value="smtp.emailsrvr.com" />
     <add key="SMTPPort" value="587" />
     <add key="EnableSSL" value="false" />
-    <add key="NotifyEmailAddress" value="support@interactiveanatomy.com" /> <!--support@interactiveanatomy.com-->
-    <add key ="Site_Url" value="//192.168.86.34:82"/>
+    <add key="NotifyEmailAddress" value="support@interactiveanatomy.com" />
+    <add key="Site_Url" value ="//52.2.38.120"/>
   </appSettings>
   <system.web>
     <compilation debug="true" targetFramework="4.5" />
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 0ef1c42..251d6bc 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -161,25 +161,39 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             }
         }
 
-        $rootScope.SendMailToUser = function (userInfo, isPasswordMissing) {
+        $rootScope.SendMailToUser = function (userInfo, isMailForPassword) {
             if ((userInfo.emailId != null) && (userInfo.emailId != '')) {
                 if (validateEmail(userInfo.emailId)) {
-                    if (isPasswordMissing == 'true')
+                    if (isMailForPassword == 'true')
                         userInfo.isPassword = true;
                     else
                         userInfo.isPassword = false;
 
                 AuthenticationService.SendMailToUser(userInfo)
                 .then(function (result) {
-                    if($('.forgot-sm').length>0) {
-                        $('.forgot-sm').fadeOut();
-                        $('.forgot-sm').modal('hide');
-                        alert('UserID sent in mail successfully.');
+                    if (result == LoginConstants.USER_NOT_FOUND) {
+                        alert("Error occured.");                     
                     }
-                    if($('.forgot-sm1').length>0) {
-                        $('.forgot-sm1').fadeOut();
-                        $('.forgot-sm1').modal('hide');
-                        alert('Password sent in mail successfully.');
+                    else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) {
+                        alert("Error occured.");
+                    }
+                    else {
+                        if (result.loginId != undefined || result.loginId != "" || result.loginId != null) {
+                            var message;
+                            if ($('.forgot-sm').length > 0) {
+                                $('.forgot-sm').fadeOut();
+                                $('.forgot-sm').modal('hide');                                
+                            }
+                            if ($('.forgot-sm1').length > 0) {
+                                $('.forgot-sm1').fadeOut();
+                                $('.forgot-sm1').modal('hide');
+                            }
+                            if (isMailForPassword)
+                                message = "Password";
+                            else
+                                message = "UserId";
+                            alert(message + " sent in mail successfully.");
+                        }
                     }
                         
                 },
@@ -189,40 +203,23 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 });
             }
             else {
-                alert("Please, enter correct email id");
+                alert("Please enter correct email id");
             }
         }
         else {
-            alert("Please, enter your email id");
+            alert("Please enter your email id");
         }
-    };
+        };
 
-    //    $rootScope.SendMailToUser = function (userInfo, missingPass) {
-    //    if ((userInfo.emailId != null) && (userInfo.emailId != '')) {
-    //        if (validateEmail(userInfo.emailId)) {
-    //            if (missingPass == 'true')
-    //                userInfo.isPassword = true;
-    //            else
-    //                userInfo.isPassword = false;
-
-    //            AuthenticationService.SendMailToUser(userInfo);
-    //        }
-    //        else {
-    //            alert("Please, enter correct email id");
-    //        }
-    //    }
-    //    else {
-    //        alert("Please, enter your email id");
-    //    }
-    //};
+        $rootScope.closeResetPasswordPopup = function () {
+            $("#passwordReset").fadeOut();
+            $("#passwordReset").modal('hide');  
+        }
 
     function validateEmail(email) {
         var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
         return re.test(email);
     }
-    //$(document).ready(function () {
-    //    getUserDetails();
-    //});
 
     $rootScope.ResetUserPassword = function (userInfo) {
         var url = $location.url();
@@ -244,7 +241,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                      }
                      else {
                          if (result.loginId != undefined || result.loginId != "" || result.loginId != null) {
-                             alert('Password has been reset.');
+                             alert('Your password has been reset.');
                              $rootScope.isVisibleLogin = true;
                              $rootScope.isVisibleResetPass = false;
                              $location.url() = "/";
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
index 8ced1ec..76d14c8 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
@@ -27,14 +27,6 @@
                 }
             })
         .success(function (data, status, headers, config) {
-            //if (data == "User not found.")
-            //    alert("User does not exists.");
-            //else {
-            //    if (!userInfo.ispassword) {
-            //        alert("UserID sent in mail successfully.");
-            //        $('.forgot-sm').fadeOut();
-            //    }
-            //}
             console.log('success');
             deferred.resolve(data);
         }).error(function (data, status, headers, config) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index 3d3eb32..4866cbd 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -1092,9 +1092,8 @@
                 </tr>
                 <tr>
                     <td align="center" valign="top" bgcolor="#808d43" style="padding:20px; overflow:hidden;">
-                        <form name="resetPwdForm" novalidate>
-                            <!--ng-submit="submitForm(resetPwdForm.$valid) && comparePasswords(userInfo)" >-->
-                            <table width="100%" border="0" cellspacing="0" cellpadding="0" id='resetPwdform' ng-controller="HomeController">
+                        <form name="resetPasswordForm" novalidate>
+                            <table width="100%" border="0" cellspacing="0" cellpadding="0" ng-controller="HomeController">
                                 <tbody>
 
                                     <tr>
@@ -1109,8 +1108,8 @@
                                     <tr>
                                         <td>
                                             <input class="form-control" name="newPassword" value="*****" type="password" style="padding:3px 5px; height:25px; width:98%;" ng-model="userInfo.newPassword" ng-minlength="5" required>
-                                            <span style="color: maroon; font-weight:bold" ng-show="resetPwdForm.newPassword.$touched && resetPwdForm.newPassword.$invalid && resetPwdForm.newPassword.$pristine">The password is required.</span>
-                                            <p ng-show="resetPwdForm.newPassword.$error.minlength" style="font-weight: bold; color: maroon;">Password is too short.</p>
+                                            <span style="color: maroon; font-weight:bold" ng-show="resetPasswordForm.newPassword.$touched && resetPasswordForm.newPassword.$invalid && resetPasswordForm.newPassword.$pristine">The password is required.</span>
+                                            <p ng-show="resetPasswordForm.newPassword.$error.minlength" style="font-weight: bold; color: maroon;">Password is too short.</p>
                                         </td>
                                     </tr>
                                     <tr>
@@ -1123,7 +1122,7 @@
                                     <tr>
                                         <td>
                                             <input class="form-control" name="confirmPassword" value="*****" type="password" style="padding:3px 5px; height:25px; width:98%;" ng-model="userInfo.confirmPassword" required>
-                                            <span style="color: maroon; font-weight: bold; " ng-show="resetPwdForm.confirmPassword.$touched && resetPwdForm.confirmPassword.$invalid">Confirm password is required.</span>
+                                            <span style="color: maroon; font-weight: bold; " ng-show="resetPasswordForm.confirmPassword.$touched && resetPasswordForm.confirmPassword.$invalid">Confirm password is required.</span>
                                             <span style="color: maroon; font-weight: bold; " ng-if="errorMesaage">{{errorMesaage}}</span>
                                         </td>
                                     </tr>
@@ -1132,8 +1131,8 @@
                                     </tr>
                                     <tr>
                                         <td>
-                                            <button type="submit" ng-click="ResetUserPassword(userInfo)" ng-submit="submitForm(resetPwdForm.$valid)" style=" color:#423030; background:#ff9900; border:1px solid #ff9900; cursor:pointer; color:#fff; padding:5px 10px; font-size:16px; text-transform:uppercase; text-align:center; text-decoration:none; font-family:gotham, 'Helvetica Neue' , helvetica, arial, sans-serif" id="btnUpdatePwd">Submit</button>
-                                            <button type="submit" id="close-resetPwdForm" ng-click="closeResetPwdPopup()" style="color:#423030; background:#231f20; border:1px solid #231f20; cursor:pointer; color:#fff; padding:5px 10px; font-size:16px; text-transform:uppercase; text-align:center; text-decoration:none; font-family:Gotham, 'Helvetica Neue', Helvetica, Arial, sans-serif" data-dismiss="modal">Close</button>
+                                            <button type="submit" ng-click="ResetUserPassword(userInfo)" ng-submit="submitForm(resetPwdForm.$valid)" style=" color:#423030; background:#ff9900; border:1px solid #ff9900; cursor:pointer; color:#fff; padding:5px 10px; font-size:16px; text-transform:uppercase; text-align:center; text-decoration:none; font-family:gotham, 'Helvetica Neue' , helvetica, arial, sans-serif" id="btnUpdatePassword">Submit</button>
+                                            <button type="submit" id="close-resetPasswordForm" ng-click="closeResetPasswordPopup()" style="color:#423030; background:#231f20; border:1px solid #231f20; cursor:pointer; color:#fff; padding:5px 10px; font-size:16px; text-transform:uppercase; text-align:center; text-decoration:none; font-family:Gotham, 'Helvetica Neue', Helvetica, Arial, sans-serif" data-dismiss="modal">Close</button>
                                         </td>
                                     </tr>
                                 </tbody>