diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 9d3150c..9f4abd1 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -298,7 +298,7 @@
             <h2 style="margin-left:94px; margin-top:-4px">Fill in your data here:</h2>
                                              </td></tr>
                <tr style="color:#003680; height:30px;"><td colspan="2">
-                       <asp:TextBox ID="txt_CustomerID" CssClass="bg-UID-icon" runat="server" ValidationGroup="val-desk" Width="265" Placeholder="Customer-ID" style="margin-left:45px;color:#003680" Font-Size="1.125em"></asp:TextBox>                                             
+                       <asp:TextBox ID="txt_CustomerID" CssClass="bg-UID-icon" runat="server" ValidationGroup="val-desk" SetFocusOnError="true" Width="265" Placeholder="Customer-ID" style="margin-left:45px;color:#003680" Font-Size="1.125em"></asp:TextBox>                                             
                        <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="txt_CustomerID" SetFocusOnError="true" ForeColor="Red" Text="" ValidationGroup="val-desk"></asp:RequiredFieldValidator>
                     </td></tr>
                 <tr style="color:#003680; height:30px;">                                 
@@ -309,7 +309,7 @@
                 <tr style="color:#003680; height:20px;">                                
                      <td align="left" colspan="2"> 
                     <asp:TextBox ID="txt_Username" runat="server" CssClass="bg-user-icon" ValidationGroup="val-desk" Placeholder="Username" Font-Size="1.125em" Width="265" style="margin-left:45px;color:#003680;margin-bottom:-6px" />
-                        <asp:RequiredFieldValidator ID="valreqtxtusername" SetFocusOnError="false" ControlToValidate="txt_Username" ValidationGroup="val-desk" runat="server" ForeColor="Red" Text="" ErrorMessage=""></asp:RequiredFieldValidator>           
+                        <asp:RequiredFieldValidator ID="valreqtxtusername" SetFocusOnError="true" ControlToValidate="txt_Username" ValidationGroup="val-desk" runat="server" ForeColor="Red" Text="" ErrorMessage=""></asp:RequiredFieldValidator>           
                 
                      </td></tr>
                 <tr style="color:#003680; height:30px;">
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index 7bb0422..6c234e7 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -341,21 +341,19 @@
                                 <tr style="color:#003680; height:86px">
                                         <td align="left">                                                                           
                                             <asp:TextBox ID="txt_CustomerID_M" CssClass="bg-UID-icon" runat="server" ValidationGroup="Login_M" Width="325" Placeholder="Customer-ID" Font-Size="2.025em" style="margin-left: 22px;margin-top:20px;"></asp:TextBox>                                             
-                                            <asp:RequiredFieldValidator ID="CustomerID_M_required" runat="server" ControlToValidate="txt_CustomerID_M" SetFocusOnError="false" ForeColor="Red" style="margin-left:22px;font-size:19px" ValidationGroup="Login_M" ErrorMessage=""></asp:RequiredFieldValidator>                                      
-                                            
+                                            <asp:RequiredFieldValidator ID="CustomerID_M_required" runat="server" ControlToValidate="txt_CustomerID_M" SetFocusOnError="true" ForeColor="Red" style="margin-left:22px;font-size:19px" ValidationGroup="Login_M" ErrorMessage=""></asp:RequiredFieldValidator>                                  
                                         </td>
                                 </tr>  
                                 <tr style="color:#003680; height:86px;">  
                                      <td align="left" colspan="2">                                        
                                         <asp:TextBox id="Username" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width = "325"  ValidationGroup="Login_M" Placeholder="Username" required="true" Font-Size="2.025em"  style="margin-left:22px;color:#003680"></asp:TextBox>                                                                                     
-                                        <asp:RequiredFieldValidator ID="UserName_M_required" runat="server" ControlToValidate="Username" ErrorMessage="" ForeColor="Red" style="margin-left:22px;font-size:19px" ValidationGroup="Login_M"></asp:RequiredFieldValidator> 
-                                        
+                                        <asp:RequiredFieldValidator ID="UserName_M_required" runat="server" ControlToValidate="Username" ErrorMessage="" ForeColor="Red" style="margin-left:22px;font-size:19px" ValidationGroup="Login_M" SetFocusOnError="true"></asp:RequiredFieldValidator>                                   
                                      </td>
                                 </tr>
                                <tr style="color:#003680; height:86px;">  
                                      <td align="left" colspan="2">                                        
                                         <asp:TextBox ID="Password" runat="server" CssClass="bg-key-icon" TextMode="Password" Tooltip="Please provide the Password" required="true" Width = "325" Font-Size="2.025em" ValidationGroup="Login_M" MaxLength="30" AutoCompleteType="Enabled" CausesValidation="true" style="margin-left:22px;color:#003680" Placeholder="Password" Text="Password"></asp:TextBox>                                    
-                                         <asp:RequiredFieldValidator ID="Passwordrequired_M" runat="server" ControlToValidate="Password" style="margin-left:22px;color:red;" ErrorMessage="" ForeColor="Red" ToolTip="" ValidationGroup="Login_M"></asp:RequiredFieldValidator>                                         
+                                         <asp:RequiredFieldValidator ID="Passwordrequired_M" runat="server" SetFocusOnError="true" ControlToValidate="Password" style="margin-left:22px;color:red;" ErrorMessage="" ForeColor="Red" ToolTip="" ValidationGroup="Login_M"></asp:RequiredFieldValidator>                                         
                                      </td>
                                  </tr>       
                          <tr style="color:#003680; height:143px;">