diff --git a/login/ChangePW.aspx.vb b/login/ChangePW.aspx.vb
index ab6af7d..f97e229 100644
--- a/login/ChangePW.aspx.vb
+++ b/login/ChangePW.aspx.vb
@@ -75,7 +75,7 @@ Partial Class login_ChangePW
             reqPasswtxt_M.Validate()
             reqPassw1txt_M.Validate()
 
-            If reqPassw1txt_M.IsValid And reqPasswtxt_M.IsValid Then
+            If reqPasswtxt_M.IsValid And reqPassw1txt_M.IsValid Then
                 tempstr = txt_Pw_M.Text
             End If
         Else
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index ade8ccd..558f95c 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -304,16 +304,16 @@
                                  </tr>       
                          <tr style="color:#003680; height:55px;">
                                       <td align="left" colspan="2">
-                                         <asp:Button ID="LoginButton" runat="server" CommandName="Login" BorderStyle="None" Text="Login" ValidationGroup="Login" CausesValidation="true" target="_top" OnClientClick="bust2()" Width="320px" Font-Size="20px" style="margin-left:22px; padding:0px 0px 0px 0px"/>
+                                         <asp:Button ID="LoginButton" runat="server" CommandName="Login" BorderStyle="None" Text="Login" ValidationGroup="Login" target="_top" OnClientClick="bust2()" Width="320px" Font-Size="20px" style="margin-left:22px; padding:0px 0px 0px 0px"/>
                                       </td>
                              </tr>
                                  <tr id="tblrowbuttons" style="color:#003680; height:37px;">
                                       <td align="left" colspan="2">
-                                           <asp:CheckBox ID="RememberMe" runat="server" Text="Remember me." style="margin-left:22px;" />
+                                           <asp:CheckBox ID="RememberMe" runat="server" ValidationGroup="Login" Text="Remember me." style="margin-left:22px;"/>
                                       </td>
                                      <td align="right" colspan="4">                                  
                                     
-                                       <a ID="LinkButton2" runat="server" target="_top" href="ForgotPW.aspx" style="margin-left:-154px;margin-right:-42px"> I forgot my password</a> 
+                                       <a id="LinkButton2" runat="server" target="_top" href="ForgotPW.aspx" style="margin-left:-154px;margin-right:-42px">I forgot my password</a> 
                                    </td>  
                                  </tr>
                                  <tr style="color:#003680; height:16px">
@@ -355,15 +355,15 @@
                                  </tr>       
                          <tr style="color:#003680; height:143px;">
                                       <td align="left" colspan="2">
-                                         <asp:Button ID="LoginButton_M" runat="server" CommandName="Login" BorderStyle="None" Text="Login" CausesValidation="true" ValidationGroup="Login_M" target="_top" OnClientClick="bust2()" Width="320px" Font-Size="20px" style="margin-left:22px; padding:0px 0px 0px 0px"/>
+                                         <asp:Button ID="LoginButton_M" runat="server" CommandName="Login" BorderStyle="None" Text="Login" ValidationGroup="Login_M" target="_top" OnClientClick="bust2()" Width="320px" Font-Size="20px" style="margin-left:22px; padding:0px 0px 0px 0px"/>
                                       </td>
                              </tr>
                                  <tr style="color:#003680; height:46px;">
                                       <td align="left" colspan="2">
-                                           <asp:CheckBox ID="RememberMe_M" runat="server" style="margin-left:22px;"/><label for="RememberMe_M" id="lbl_for_chkbox_M">Remember me.</label>
+                                           <asp:CheckBox ID="RememberMe_M" runat="server" ValidationGroup="Login_M" style="margin-left:22px;"/><label for="RememberMe_M" id="lbl_for_chkbox_M">Remember me.</label>
                                       </td>
                                      <td align="right" colspan="2">                                  
-                                       <a id="btn_ForgotPW_M" runat="server" target="_top" href="ForgotPW.aspx" style="margin-left:-164px;margin-right:-62px;"> I forgot my password</a> 
+                                       <a id="btn_ForgotPW_M"  runat="server" target="_top" href="ForgotPW.aspx" style="margin-left:-164px;margin-right:-62px;"> I forgot my password</a> 
                                    </td>  
                                  </tr>
                                  <tr style="color:#003680; height:fit-content">
diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb
index de96a03..a98773e 100644
--- a/login/login_FLEX.aspx.vb
+++ b/login/login_FLEX.aspx.vb
@@ -5,7 +5,9 @@ Partial Class login_FLEX
     Inherits System.Web.UI.Page
 
     Protected Sub Page_Load(sender As Object, e As EventArgs)
-
+        If Page.IsPostBack Then
+            MsgBox("Debug")
+        End If
     End Sub
     Protected Sub ValidateUser(sender As Object, e As EventArgs)
         Dim userId As Integer = 0
@@ -61,8 +63,19 @@ Partial Class login_FLEX
 
     Protected Sub LoginButton_Click(sender As Object, e As EventArgs)
         Validate("Login")
+        If Page.IsValid() Then
+            Response.Redirect("../Customers/CustomsAviso.aspx")
+        Else
+            Response.Redirect("login_FLEX.aspx")
+        End If
+
     End Sub
     Protected Sub LoginButton_M_Click(sender As Object, e As EventArgs)
         Validate("Login_M")
+        If Page.IsValid() Then
+            Response.Redirect("../Customers/CustomsAviso.aspx")
+        Else
+            Response.Redirect("login_FLEX.aspx")
+        End If
     End Sub
 End Class