From ce69b2e1ce621e9ba3bb35141cbeea76af0e380c Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Tue, 19 Oct 2021 10:22:34 +0200
Subject: [PATCH] Anpassungen css required validatoren

---
 Global.asax              |  6 +++-
 login/ChangePW.aspx      | 51 +++++++++++++++++++++-----------
 login/ChangePW.aspx.vb   |  4 +--
 login/login_FLEX.aspx    | 30 ++++++++-----------
 login/login_FLEX.aspx.vb | 64 +++++++++++++++++++++++++++++++---------
 5 files changed, 104 insertions(+), 51 deletions(-)

diff --git a/Global.asax b/Global.asax
index b698a99..0dc5ae7 100644
--- a/Global.asax
+++ b/Global.asax
@@ -45,6 +45,10 @@
         Session.Remove("TokenforEmail");
         Session.Remove("SessID");
         Session.Remove("urltochangepw");
-        Session.Remove("USerID");
+        Session.Remove("UserID");
+        Session.Remove("test");
+        Session.Remove("PW");
+
+
     }           
 </script>
diff --git a/login/ChangePW.aspx b/login/ChangePW.aspx
index b9af7d9..c9cf513 100644
--- a/login/ChangePW.aspx
+++ b/login/ChangePW.aspx
@@ -160,33 +160,42 @@
                                 <asp:Label ID="lbl_Ueberschrift" runat="server" Text="Password change:" style="margin-left:55px"></asp:Label>
                              </td>
                           </tr>                    
-                          <tr style="color:#003680;height:36.67px;">
+                          <tr style="color:#003680;height:26.67px;">
                             <td colspan="4">
                                 <asp:TextBox id="txt_Pw" CssClass="bg-key-icon" runat="server" TextMode="Password" Width="250px" Font-Names="Verdana" OnTextChanged="txt_Pw_TextChanged" AutoCompleteType="Disabled" style="margin-left:42px;color:#003680" OnClick="this.value='';" Placeholder="Enter Password"></asp:TextBox> 
                                 <span></span>
                                 <asp:Image ID="Image1" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="13px" Width="13px" style="margin-left:32px" ToolTip="The Password has to contain minimum 4 characters. It must have at least 1 special character, one uppercase letter and at least 1 downcase letter at an maximum of 30 characters."/>
-                                </td>    
+                                </td>
                               </tr>
+                         
+                              <tr style="color:#003680;height:10px;">
+                                  <td>                            
+                                      <asp:RegularExpressionValidator ID="reqPassw1txt"  style="margin-left:32px;" runat="server" ControlToValidate="txt_Pw" ValidationGroup="TXT_val" ForeColor="Red" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="The Password has to match the criterias of the info-button." SetFocusOnError="true"></asp:RegularExpressionValidator>                            
+                                  </td>
+                             </tr>
+                              
                          <tr style="color:#003680;height:36.67px;">
                             <td>
                                 <asp:TextBox id="txt_Pw_WH" CssClass="bg-key-icon" Width="250px" OnTextChanged="txt_Pw_WH_TextChanged" runat="server" TextMode="Password" Font-Names="Verdana" AutoCompleteType="Disabled" style="margin-left:42px;color:#003680" OnClick="this.value='';" Placeholder="Repeat Password"></asp:TextBox>  
                                 <span></span>
                                 <asp:Image ID="Image2" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="13px" Width="13px" style="margin-left:32px" ToolTip="The passwords have to match with each other."/>
                             </td>
+                         </tr>    
+                         <tr>
+                             <td colspan="4">
+                                 <asp:RequiredFieldValidator ID="reqPasswtxt" style="margin-left:32px;" runat="server" ControlToValidate="txt_Pw_WH" ErrorMessage="Please repeat the password!" Display="Dynamic" ForeColor="Red"></asp:RequiredFieldValidator>
+                             </td>
                          </tr>
-                      
                         <tr style="color:#003680;height:15.67px;">
                             <td>    
                                 <asp:Button ID="btn_submitpw" runat="server" Text="Change the password!" OnClick="btn_submitpw_Click" Width="250px" style="margin-left:38px;border:none"/>
                             </td>
                         </tr>
                               <tr style="color:#003680;height:10px;">
-                            <td>
-                                <asp:RequiredFieldValidator ID="reqPasswtxt" style="margin-left:32px;" runat="server" ControlToValidate="txt_Pw_WH" ErrorMessage="Please repeat the password!" Display="Dynamic" ForeColor="Red"></asp:RequiredFieldValidator>
+                            <td>                                                                         
                                 <asp:CompareValidator ID="confirmPasswordReq" style="margin-left:32px;" runat="server" ControlToCompare="txt_Pw" ControlToValidate="txt_Pw_WH" ErrorMessage="Please try again! The passwords didn't match." Display="Dynamic" ForeColor="Red"></asp:CompareValidator>                                
-                                <asp:RegularExpressionValidator ID="regexval_txt_Pw_WH" style="margin-left:32px;" runat="server" ControlToValidate="txt_Pw_WH"  ValidationGroup="TXT_val" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ForeColor="Red" ErrorMessage="The Password has to match the criterias of the info-button." SetFocusOnError="true"></asp:RegularExpressionValidator>                                                  
-                                <asp:RequiredFieldValidator ID="reqPassw1txt" runat="server" style="margin-left:32px;" ControlToValidate="txt_Pw" ErrorMessage="Please enter a password!" Display="Dynamic" ForeColor="Red"></asp:RequiredFieldValidator>
                                 <asp:RegularExpressionValidator ID="regexval_txt_Pw"  style="margin-left:32px;" runat="server" ControlToValidate="txt_Pw" ValidationGroup="TXT_val" ForeColor="Red" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="The Password has to match the criterias of the info-button." SetFocusOnError="true"></asp:RegularExpressionValidator>
+                                <asp:RegularExpressionValidator ID="regexval_txt_Pw_WH" style="margin-left:32px;" runat="server" ControlToValidate="txt_Pw_WH"  ValidationGroup="TXT_val" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ForeColor="Red" ErrorMessage="The Password has to match the criterias of the info-button." SetFocusOnError="true"></asp:RegularExpressionValidator>                                                                                                                  
                                 </td>
                         </tr>
                     </table>
@@ -205,8 +214,13 @@
                                 <span></span></td>
                                 <td>
                                 <asp:ImageButton ID="Image1_M" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="22px" Width="19px" style="margin-left:12px"/>
-                                </td>    
-                              </tr >                                 
+                                </td> 
+                              </tr>
+                              <tr style="height:15px">
+                              <td>                                  
+                                  <asp:RequiredFieldValidator ID="reqPassw1txt_M" runat="server" ControlToValidate="txt_Pw_M" ErrorMessage="Please enter the password!" ForeColor="Red" Font-Size="19" Display="Dynamic"></asp:RequiredFieldValidator>
+                              </td>
+                              </tr>                                 
                          <tr style="color:#003680;height:36.67px;">
                             <td>
                                 <asp:TextBox id="txt_Pw_WH_M" CssClass="bg-key-icon" Width="245px" Font-Size="1.125em" ValidationGroup="TXT_val_WH_M" OnTextChanged="txt_Pw_WH_TextChanged" runat="server" TextMode="Password" Font-Names="Verdana" AutoCompleteType="Disabled" style="margin-left:22px;color:#003680" Placeholder="Repeat Password"></asp:TextBox>  
@@ -215,20 +229,23 @@
                                 <asp:ImageButton ID="Image2_M" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="22px" Width="19px" style="margin-left:12px;border:none;margin-top:15px" />
                             </td>
                          </tr>
-                      
+                      <tr style="height:15px">
+                          <td colspan="2">
+                              <asp:RequiredFieldValidator ID="reqPasswtxt_M" runat="server" ControlToValidate="txt_Pw_WH_M" ErrorMessage="Please repeat the password!" Font-Size="19" ForeColor="Red" Display="Dynamic"></asp:RequiredFieldValidator>
+                          </td>
+                      </tr>
                         <tr style="color:#003680;height:26.67px;">
                             <td>    
                                 <asp:Button ID="btn_submitpw_M" runat="server" Text="Change the password!" OnClick="btn_submitpw_Click" Width="290px" style="margin-left:15px;border:none;height:40px;margin-top:1px"/>
                             </td>
                         </tr>
                               <tr style="color:#003680;height:20px;">
-                            <td>
-                                <asp:RequiredFieldValidator ID="reqPasswtxt_M" runat="server" ControlToValidate="txt_Pw_WH_M" ErrorMessage="Please repeat the password!" ForeColor="Red" Display="Dynamic"></asp:RequiredFieldValidator>
-                                <asp:CompareValidator ID="confirmPasswordReq_M" runat="server" ControlToCompare="txt_Pw_M" ControlToValidate="txt_Pw_WH_M" ValidationGroup="TXT_val_WH_M" ForeColor="Red" ErrorMessage="Please try again! The passwords didn't match." Display="Dynamic"></asp:CompareValidator>                                
-                                <asp:RegularExpressionValidator ID="regexval_txt_Pw_WH_M" runat="server" ControlToValidate="txt_Pw_WH_M" ValidationGroup="TXT_val_WH_M" ForeColor="Red" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="The Password has to match teh criterias of the info-button." SetFocusOnError="true"></asp:RegularExpressionValidator>                                                  
-                                <asp:RequiredFieldValidator ID="reqPassw1txt_M" runat="server" ControlToValidate="txt_Pw_M" ErrorMessage="Please enter a password!" ForeColor="Red" Display="Dynamic"></asp:RequiredFieldValidator>
-                                <asp:RegularExpressionValidator ControlToValidate="txt_Pw_M" runat="server" ID="regexval_txt_Pw_M" ValidationGroup="TXT_val_M" ForeColor="Red" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="The Password has to match teh criterias of the info-button." SetFocusOnError="true"></asp:RegularExpressionValidator>
-                                <asp:Label ID="lbl_messagetext" runat="server" Text="Label"></asp:Label>
+                            <td>                                
+                                
+                                <asp:CompareValidator ID="confirmPasswordReq_M" runat="server" ControlToCompare="txt_Pw_M" ControlToValidate="txt_Pw_WH_M" ValidationGroup="TXT_val_WH_M" Font-Size="19" ForeColor="Red" ErrorMessage="Please try again! The passwords didn't match." Display="Dynamic"></asp:CompareValidator>                                
+                                <asp:RegularExpressionValidator ID="regexval_txt_Pw_WH_M" runat="server" ControlToValidate="txt_Pw_WH_M" ValidationGroup="TXT_val_WH_M" ForeColor="Red" Font-Size="19" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="The Password has to match the criterias of the info-button." SetFocusOnError="true"></asp:RegularExpressionValidator>                                                                                  
+                                <asp:RegularExpressionValidator ControlToValidate="txt_Pw_M" runat="server" ID="regexval_txt_Pw_M" ValidationGroup="TXT_val_M" ForeColor="Red" Font-Size="19" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="The Password has to match the criterias of the info-button." SetFocusOnError="true"></asp:RegularExpressionValidator>
+                                <asp:Label ID="lbl_messagetext" runat="server" Text=""></asp:Label>
                                 </td>
                         </tr>
                     </table>  
diff --git a/login/ChangePW.aspx.vb b/login/ChangePW.aspx.vb
index 2f34d5d..6c37a13 100644
--- a/login/ChangePW.aspx.vb
+++ b/login/ChangePW.aspx.vb
@@ -57,7 +57,7 @@ Partial Class ChangePW
         Dim Msg, Style, Title As String
 
         If String.IsNullOrEmpty(txt_Pw.Text) = Not True AndAlso String.IsNullOrEmpty(txt_Pw_WH.Text) = Not True AndAlso String.IsNullOrEmpty(txt_Pw.Text) = Not True AndAlso String.IsNullOrEmpty(txt_Pw_WH_M.Text) = Not True Then
-            reqPassw1txt_M.Enabled = False
+            reqPasswtxt_M.Enabled = False
             reqPasswtxt_M.Enabled = False
             reqPasswtxt.Enabled = True
             reqPassw1txt.Enabled = True
@@ -69,7 +69,7 @@ Partial Class ChangePW
             End If
         ElseIf String.IsNullOrEmpty(txt_Pw.Text) = True AndAlso String.IsNullOrEmpty(txt_Pw_WH.Text) = True AndAlso String.IsNullOrEmpty(txt_Pw_M.Text) = Not True AndAlso String.IsNullOrEmpty(txt_Pw_WH_M.Text) = Not True Then
             reqPasswtxt.Enabled = False
-            reqPassw1txt.Enabled = False
+            reqPassw1txt_M.Enabled = False
             reqPasswtxt_M.Enabled = True
             reqPassw1txt_M.Enabled = True
             reqPasswtxt_M.Validate()
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index 3f35e62..720da63 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -277,9 +277,9 @@
             <div class="d-none d-md-block">
                     <table id="tbl_main" cellpadding="0" style="margin: 6px 0px 6px 6px; border:none">
                              <tr style="color:#003680; height:30px;">
-                               <td align="left" style="color:#fff;font-kerning:auto;"> 
-                                           <asp:Label ID="lbl_login" runat="server" Text="Login" style=" color: #003680;font-size: 1.320901320901321em; font-weight: 600; margin-left:162px"></asp:Label> 
-                               </td>
+                                   <td align="left" style="color:#fff;font-kerning:auto;"> 
+                                        <asp:Label ID="lbl_login" runat="server" Text="Login" style=" color: #003680;font-size: 1.320901320901321em; font-weight: 600; margin-left:162px"></asp:Label> 
+                                   </td>
                                </tr>                           
                                 <tr style="color:#003680; height:46px;">
                                         <td align="left"  colspan="2">                                                                           
@@ -292,14 +292,13 @@
                                      <td align="left" colspan="2">                                                                       
                                            <asp:TextBox ID="UserName" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width = "320" ValidationGroup="Login" required="true" Font-Size="1.25em"  style="margin-left:22px;color:#003680" Placeholder="Username" ></asp:TextBox>                                                
                                            <asp:RequiredFieldValidator ID="UserNamerequired" ForeColor="Red" style="font-size:19px" runat="server" ControlToValidate="UserName" SetFocusOnError="true" ErrorMessage="Please enter the  Username." ToolTip="The Username is required." ValidationGroup="Login"></asp:RequiredFieldValidator> 
-                                           <asp:RegularExpressionValidator ID="check_UserName_regex" ControlToValidate="UserName" style="font-size:19px"  ForeColor="Red" ValidationGroup="Login" runat="server" Display="Dynamic" SetFocusOnError="true" ErrorMessage="Username does not meet the requirements." ValidationExpression="^([a-zA-Z]{4,30})$"></asp:RegularExpressionValidator>
+                                           <asp:RegularExpressionValidator ID="check_UserName_regex" ControlToValidate="UserName" style="font-size:16px"  ForeColor="Red" ValidationGroup="Login" runat="server" Display="Dynamic" SetFocusOnError="true" ErrorMessage="Username does not meet the requirements." ValidationExpression="^([a-zA-Z1-9]{4,30})$"></asp:RegularExpressionValidator>
                                      </td>
                                 </tr>
                                <tr style="color:#003680; height:46px;">  
                                      <td align="left" colspan="2">                                        
                                           <asp:TextBox ID="Password" runat="server" CssClass="bg-key-icon" TextMode="Password" required="true" Width = "320" Font-Size="1.25em" ValidationGroup="Login" MaxLength="30" AutoCompleteType="Disabled" CausesValidation="true" style="margin-left:22px;color:#003680" Placeholder="Password"></asp:TextBox>                                    
-                                          <asp:RequiredFieldValidator ID="Passwordrequired" runat="server" ControlToValidate="Password" ToolTip="Please enter the Password." ValidationGroup="Login" SetFocusOnError="true" ErrorMessage="Password is needed to authenticate."></asp:RequiredFieldValidator>                                                                    
-                                         <asp:RegularExpressionValidator ID="checkpwdREGEX" ControlToValidate="Password" ValidationGroup="Login" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[a-zA-Z\d]){4,35}$" ErrorMessage="Password doeas not match the requirements."></asp:RegularExpressionValidator>
+                                          <asp:RequiredFieldValidator ID="Passwordrequired" runat="server" ControlToValidate="Password" Font-Size="16" ToolTip="Please enter the Password." ValidationGroup="Login" SetFocusOnError="true" ErrorMessage="Password is needed to authenticate."></asp:RequiredFieldValidator>                                                                                                           
                                      </td>
                                  </tr>       
                          <tr style="color:#003680; height:55px;">
@@ -320,8 +319,7 @@
                                       <td align="center" style="color:Red;" colspan="2">
                                            <asp:Literal ID="FailureText" runat="server" EnableViewState="False"></asp:Literal>
                                       </td>
-                                 </tr>                                  
-                               
+                                 </tr>                                          
                                 </table>
                 </div>
                       <!--Smartphone-Bildschirme-->   
@@ -342,15 +340,14 @@
                                 <tr style="color:#003680; height:86px;">  
                                      <td align="left" colspan="2">                                        
                                         <asp:TextBox id="UserName_M" 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_M" ErrorMessage="Please enter the Username." ForeColor="Red" style="margin-left:22px;font-size:19px" ToolTip="The Username is required."  ValidationGroup="Login_M"></asp:RequiredFieldValidator> 
-                                   <asp:RegularExpressionValidator ID="check_UserName_M_regex" ControlToValidate="UserName_M" ValidationGroup="Login_M" ForeColor="Red" runat="server" style="margin-left:132px" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z]{4,30})$" ErrorMessage="Username does not meet the requirements." ></asp:RegularExpressionValidator>
+                                        <asp:RequiredFieldValidator ID="UserName_M_required" runat="server" ControlToValidate="UserName_M" ErrorMessage="Please enter the Username." ForeColor="Red" style="margin-left:22px;font-size:19px" ToolTip="The Username is required." ValidationGroup="Login_M"></asp:RequiredFieldValidator> 
+                                   <asp:RegularExpressionValidator ID="check_UserName_M_regex" ControlToValidate="UserName_M" ValidationGroup="Login_M" ForeColor="Red" runat="server" style="margin-left:132px" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z1-9]{4,30})$" ErrorMessage="Username does not meet the requirements." ></asp:RegularExpressionValidator>
                                      </td>
                                 </tr>
                                <tr style="color:#003680; height:86px;">  
                                      <td align="left" colspan="2">                                        
                                         <asp:TextBox ID="Password_M" runat="server" CssClass="bg-key-icon" TextMode="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_M" style="margin-left:22px" ErrorMessage="Password is needed to authenticate." ToolTip="Please enter the Password." ForeColor="Red" ValidationGroup="Login_M"></asp:RequiredFieldValidator>                                                                    
-                                         <asp:RegularExpressionValidator ID="checkpwd_M_REGEX" ControlToValidate="Password_M" ValidationGroup="Login_M" runat="server" Display="Dynamic" ForeColor="Red" style="margin-left:22px;font-size:19px" SetFocusOnError="true" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]){4,35}$" ErrorMessage="Password is needed to authenticate."></asp:RegularExpressionValidator>
+                                         <asp:RequiredFieldValidator ID="Passwordrequired_M" runat="server" ControlToValidate="Password_M" style="margin-left:22px" ErrorMessage="Password is needed to authenticate." ToolTip="Please enter the Password." ForeColor="Red" ValidationGroup="Login_M"></asp:RequiredFieldValidator>                                         
                                      </td>
                                  </tr>       
                          <tr style="color:#003680; height:143px;">
@@ -363,7 +360,7 @@
                                            <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">
@@ -375,12 +372,11 @@
                                   </div>
                             </center>
                      </LayoutTemplate>
-                </asp:Login>
-
-            
+                </asp:Login>            
             </form>
             </div>
-          </div>               
+          </div>           
+     
      <script type="text/javascript">
            function bust2() {
                if (top.location == self) {
diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb
index 256f537..c0e325a 100644
--- a/login/login_FLEX.aspx.vb
+++ b/login/login_FLEX.aspx.vb
@@ -4,9 +4,7 @@ Imports System.Data
 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
@@ -19,23 +17,61 @@ Partial Class login_FLEX
             ConnectionString = "Server=DEVELOPER.verag.ost.dmn\DEVSQL;Database=VERAG_HOMEPAGE;Uid=AppUser;Pwd=yp/THDd?xM+pZ$;"
             'ConnectionString = "Server=db593295684.db.1and1.com;Database=db593295684;Uid=dbo593295684;Pwd=atilla#2;"
         End If
+
         Dim tb As TextBox = form1.FindControl("UserID")
+        Dim tb_M As TextBox = form1.FindControl("UserID_M")
+        Dim tb2 As TextBox = form1.FindControl("UserName")
+        Dim tb2_M As TextBox = form1.FindControl("UserName_M")
+        Dim tb3 As TextBox = form1.FindControl("Password")
+        Dim tb3_M As TextBox = form1.FindControl("Password_M")
+
         Dim reqfieldvaluserID As RequiredFieldValidator = Page.FindControl("CustomerIDrequired")
-        reqfieldvaluserID.Validate()
-        Dim user_ID As String
+        Dim reqfieldvaluserID_M As RequiredFieldValidator = Page.FindControl("CustomerID_M_required")
+        Dim reqfieldvaluserName As RequiredFieldValidator = Page.FindControl("UserNamerequired")
+        Dim reqfieldvaluserName_M As RequiredFieldValidator = Page.FindControl("UserName_M_required")
+        Dim reqfieldvalpassw As RequiredFieldValidator = Page.FindControl("Passwordrequired")
+        Dim reqfieldvalpassw_M As RequiredFieldValidator = Page.FindControl("Passwordrequired_M")
+
+        Dim regexuserID As RegularExpressionValidator = Page.FindControl("valid_getNumberInput")
+        Dim regexuserID_M As RegularExpressionValidator = Page.FindControl("valid_getNumber_M_Input")
+        Dim regexusername As RegularExpressionValidator = Page.FindControl("check_UserName_regex")
+        Dim regexusername_M As RegularExpressionValidator = Page.FindControl("check_UserName_M_regex")
+
+        Dim user_ID As String = String.Empty
+        Dim UserNaMe As String = String.Empty
+        Dim passw As String = String.Empty
+
         If reqfieldvaluserID.IsValid Then
-            user_ID = tb.Text
-        Else
-            user_ID = String.Empty
+            regexuserID.Validate()
+            If regexuserID.IsValid Then
+                user_ID = tb.Text
+            End If
+        ElseIf reqfieldvaluserID_M.IsValid Then
+            regexusername_M.Validate()
+            If regexusername_M.IsValid Then
+                user_ID = tb_M.Text
+            End If
+        End If
+
+            If reqfieldvaluserName.IsValid Then
+            UserNaMe = tb2.Text
+        ElseIf reqfieldvaluserName_M.IsValid Then
+            UserNaMe = tb2_M.Text
+        End If
+
+        If reqfieldvalpassw.IsValid Then
+            passw = tb3.Text
+        ElseIf reqfieldvaluserName_M.IsValid Then
+            passw = tb2_M.Text
         End If
         ' Dim constr As String = ConfigurationManager.ConnectionStrings("constr").ConnectionString
         Using con As New SqlConnection(ConnectionString)
             ' Using cmd As New SqlCommand("Validate_User")
             Using cmd As New SqlCommand("SELECT COUNT(*) FROM [VERAG_HOMEPAGE].[dbo].[Users] WHERE Username=@Username AND Password=@Password AND Kundennr=@UserID")
                 ' cmd.CommandType = CommandType.StoredProcedure
-                cmd.Parameters.AddWithValue("@Username", Login1.UserName)
+                cmd.Parameters.AddWithValue("@Username", UserNaMe)
                 cmd.Parameters.AddWithValue("UserID", user_ID)
-                cmd.Parameters.AddWithValue("@Password", Login1.Password)
+                cmd.Parameters.AddWithValue("@Password", passw)
                 cmd.Connection = con
                 con.Open()
                 ' userId = Convert.ToInt32(cmd.ExecuteScalar())
@@ -52,11 +88,11 @@ Partial Class login_FLEX
                             Exit Select
                         Case Else
                             Login1.FailureText = "Erfolgreich validiert."
-                            Session.Add("test", Login1.UserName)
+                            Session.Add("test", UserNaMe)
+                            Session.Add("UserID", user_ID)
+                            Session.Add("PW", passw)
 
-                            Session.Add("PW", Login1.Password)
-
-                            FormsAuthentication.RedirectFromLoginPage(Login1.UserName, True)
+                            FormsAuthentication.RedirectFromLoginPage(UserNaMe, True)
 
                             'FormsAuthentication.SetAuthCookie(Login1.UserName, True)
                             'Response.Redirect("../Customers/CustomsAviso.aspx")