diff --git a/400-SOURCECODE/AIAHTML5.API/Templates/forgot-Password.html b/400-SOURCECODE/AIAHTML5.API/Templates/forgot-Password.html
index 29aaf91..803e5c6 100644
--- a/400-SOURCECODE/AIAHTML5.API/Templates/forgot-Password.html
+++ b/400-SOURCECODE/AIAHTML5.API/Templates/forgot-Password.html
@@ -34,10 +34,16 @@
                             <td colspan='2'>&nbsp;</td>
                         </tr>
                         <tr>
-                            <td colspan='2' style=' font-size:16px; font-weight:bold; color:#fff; font-family:Gotham, Helvetica, Arial, sans-serif'>You can reset your password by clicking the link below:</td>
-                        </tr>                        
+                            <td colspan='2' style=' font-size:16px; font-weight:bold; color:#fff; font-family:Gotham, Helvetica, Arial, sans-serif'>Click the Reset Password button below to reset your A.D.A.M. OnDemand™ account password</td>
+                        </tr>
+                        <tr>
+                            <td colspan='2'>&nbsp;</td>
+                        </tr>                       
                         <tr>
-                            <td colspan='2' style=' font-size:16px; font-weight:bold; color:#fff; font-family:Gotham, Helvetica, Arial, sans-serif'><a href="{resetPasswordLink}">{resetPasswordLink}</a></td>
+                            <td width="45%" bgcolor="#0072a7" style="padding:15px 20px; cursor: pointer;" onclick="document.location.href = '{resetPasswordLink}'">
+                                <a href="{resetPasswordLink}" style="color:#ffffff; font-size:16px; text-transform:uppercase; text-align:center; text-decoration:none; font-family:Gotham, 'Helvetica Neue', Helvetica, Arial, sans-serif; display: block;">Reset Password</a>
+                            </td>
+                            <td width="55%" style="padding:10px 20px;">&nbsp;</td>
                         </tr>
                         <tr>
                             <td colspan='2'>&nbsp;</td>
diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
index 2b2afd7..70aa98b 100644
--- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
+++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
index 4525154..d8ba05f 100644
--- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
+++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
@@ -31,11 +31,11 @@
 </log4net>
   
   <appSettings>
-    <add key="SenderEmailAddress" value="utkarsh.singh@ebix.com" />
+    <add key="SenderEmailAddress" value="support@interactiveanatomy.com" />
     <add key="ErrorNotificationEmailAddress" value="support@interactiveanatomy.com" />
-    <add key="SenderPassword" value="utkarsh@3bix" />
-    <add key="SMTPAddress" value="smtp.emailsrvr.com" />
-    <add key="SMTPPort" value="587" />
+    <add key="SenderPassword" value="" />
+    <add key="SMTPAddress" value="10.100.12.13" />
+    <add key="SMTPPort" value="25" />
     <add key="EnableSSL" value="false" />
     <add key="Site_Url" value ="//52.2.38.120"/>
     <add key ="HostAddress" value="10.100.12.13" />
diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
index 2c340b8..bd13005 100644
--- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
+++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 2c176e1..87c0991 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -231,7 +231,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
 
     $rootScope.closeResetPasswordPopup = function () {
         $("#passwordReset").fadeOut();
-        $("#passwordReset").modal('hide');
+        $("#passwordReset").modal('hide');        
+        $location.url("/");
+        $rootScope.isVisibleResetPass = false;
+        $rootScope.isVisibleLogin = true;
     }
 
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index 3d7bbb1..ba6b963 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -203,7 +203,7 @@
                                             <span class="input-group-addon"><i class="fa fa-key"></i></span>
                                             <input type="password" class="form-control" placeholder="Password" ng-model="userInfo.password">
                                         </div>
-                                        <span class="help-block text-right small "><a class="color-white" id="forgotPasswordAnchor" data-toggle="modal" data-target=".forgot-sm1">Forgot Password?</a></span> <!--#resetpass" href="/app/views/Home/resetPwd.html"-->
+                                        <span class="help-block text-right small "><a class="color-white" style="cursor: pointer;"id="forgotPasswordAnchor" data-toggle="modal" data-target=".forgot-sm1">Forgot Password?</a></span> <!--#resetpass" href="/app/views/Home/resetPwd.html"-->
                                     </div>
                                     <div class="form-group">
                                         <button class="btn btn-primary pull-right" ng-click="AuthenticateUser(userInfo)">Log In</button>
@@ -1131,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="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>
+                                            <button type="submit" ng-click="ResetUserPassword(userInfo)" ng-submit="submitForm(resetPwdForm.$valid)" style="background: #0072a7; border: 1px solid #005076; 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:#666; border:1px solid #999; 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>