diff --git a/login/ChangePW.aspx b/login/ChangePW.aspx
index 931bcac..995309b 100644
--- a/login/ChangePW.aspx
+++ b/login/ChangePW.aspx
@@ -162,14 +162,14 @@
                           </tr>                    
                           <tr style="color:#003680;height:36.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='';"></asp:TextBox> 
+                                <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>    
                               </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='';"></asp:TextBox>  
+                                <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>
@@ -201,7 +201,7 @@
                           </tr>                    
                           <tr style="color:#003680;height:36.67px;">
                             <td>
-                                <asp:TextBox id="txt_Pw_M" CssClass="bg-key-icon" runat="server" Font-Size="1.125em" ValidationGroup="TXT_val_M" TextMode="Password" Width="245px" Font-Names="Verdana" OnTextChanged="txt_Pw_TextChanged" AutoCompleteType="Disabled" style="margin-left:22px;color:#003680" OnClick="this.value='';"></asp:TextBox> 
+                                <asp:TextBox id="txt_Pw_M" CssClass="bg-key-icon" runat="server" Font-Size="1.125em" ValidationGroup="TXT_val_M" TextMode="Password" Width="245px" Font-Names="Verdana" OnTextChanged="txt_Pw_TextChanged" AutoCompleteType="Disabled" style="margin-left:22px;color:#003680" OnClick="this.value='';" Placeholder="Enter Password"></asp:TextBox> 
                                 <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"/>
@@ -209,14 +209,14 @@
                               </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" OnClick="this.value='';"></asp:TextBox>  
+                                <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" OnClick="this.value='';" Placeholder="Repeat Password"></asp:TextBox>  
                                 <span></span></td>
                                 <td>
                                 <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="color:#003680;height:36.67px;">
+                        <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>
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index 8741d81..45d158e 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -241,7 +241,7 @@ Partial Class login_ForgotPW
             Dim Ausschusstext2 As String = "und Zinsen zuletzt auf Zölle angerechnet. Zahlbar und klagbar in Schärding oder Ried. Steuer-Zoll-und Tarifauskünfte sind unverbindlich."
             Dim Ausschusstext3 As String = "We operate exclusively on the basis of the General Freight Forwarding Terms and Conditions in the respectively applicable version. Payments are initially"
             Dim Ausschusstext4 As String = "charged on freight, fees and interests and at last on customs duties. The place of jurisdiction: Schärding / Ried. Tax, customs and tariff information are not binding."
-            htmlbody = String.Format("Dear, {0},<br /><br /> Please follow the Link to reset your password:<br /><br />" + Environment.NewLine + "<a runat=" + "server" + " href=http://" + getdomianenvironment + ServPort + "/login/ChangePW.aspx?Par1=" + VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(tokenname) + ">Link</a>" + Environment.NewLine + "<br /><br /><br />Kind regards, <br /><span style='color: #043381'><b>VERAG | EDV Support</b></span><br /><span style='color: #043381'>VERAG Spedition AG | A 4975 Suben, Nr. 100</span><br /><span style='color: #043381'>T.<a href='tel:+43 7711 2777-xx'>+43 7711 2777-xx</a> |<a href='mailto:@support@verag.ag'>support@verag.ag</a> |" + emailnr + "FN xxxxxxx</span><br /><span style='color: #043381;font-size:12px'><i>" + Ausschusstext + "</i></span><br /><span style='color: #043381;font-size:12px'><i>" + Ausschusstext2 + "</i></span><br /><span style='color: #043381;font-size:12px'><i>" + Ausschusstext3 + "</i></span><br /><span style='color: #043381;font-size:12px'><i>" + Ausschusstext4 + "</i></span><br />", username, password)
+            htmlbody = String.Format("Dear, {0},<br /><br /> Please follow the Link to reset your password:<br /><br />" + Environment.NewLine + "<a runat=" + "server" + " href=http://" + getdomianenvironment + ServPort + "/login/ChangePW.aspx?Par1=" + VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(tokenname) + ">http://" + getdomianenvironment + ServPort + "/login/ChangePW.aspx?Par1=" + VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(tokenname) + "</a>" + Environment.NewLine + "<br /><br /><br />Kind regards, <br /><span style='color: #043381'><b>VERAG | EDV Support</b></span><br /><span style='color: #043381'>VERAG Spedition AG | A 4975 Suben, Nr. 100</span><br /><span style='color: #043381'>T.<a href='tel:+43 7711 2777-xx'>+43 7711 2777-xx</a> |<a href='mailto:@support@verag.ag'>support@verag.ag</a> |" + emailnr + "FN xxxxxxx</span><br /><span style='color: #043381;font-size:12px'><i>" + Ausschusstext + "</i></span><br /><span style='color: #043381;font-size:12px'><i>" + Ausschusstext2 + "</i></span><br /><span style='color: #043381;font-size:12px'><i>" + Ausschusstext3 + "</i></span><br /><span style='color: #043381;font-size:12px'><i>" + Ausschusstext4 + "</i></span><br />", username, password)
         ElseIf String.IsNullOrWhiteSpace(HttpContext.Current.Request.ServerVariables("SERVER_NAME")) = False Then
             getdomianenvironment = HttpContext.Current.Request.ServerVariables("SERVER_NAME")
             ServPort = String.Empty
@@ -252,7 +252,7 @@ Partial Class login_ForgotPW
             Dim Ausschusstext2 As String = "und Zinsen zuletzt auf Zölle angerechnet. Zahlbar und klagbar in Schärding oder Ried. Steuer-Zoll-und Tarifauskünfte sind unverbindlich."
             Dim Ausschusstext3 As String = "We operate exclusively on the basis of the General Freight Forwarding Terms and Conditions in the respectively applicable version. Payments are initially"
             Dim Ausschusstext4 As String = "charged on freight, fees and interests and at last on customs duties. The place of jurisdiction: Schärding / Ried. Tax, customs and tariff information are not binding."
-            htmlbody = String.Format("Dear, {0},<br /><br /> Please follow the Link to reset your password:<br /><br />" + Environment.NewLine + "<a runat=" + "server" + " href=http://" + getdomianenvironment + "/login/ChangePW.aspx?Par1=" + VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(tokenname) + ">Link</a>" + Environment.NewLine + "<br /><br /><br />Kind regards, <br /><span style='color: #043381'><b>VERAG | EDV Support</b></span><br /><span style='color: #043381'>VERAG Spedition AG | A 4975 Suben, Nr. 100</span><br /><span style='color: #043381'>T.<a href='tel:+43 7711 2777-xx'>+43 7711 2777-xx</a> |<a href='mailto:@support@verag.ag'>support@verag.ag</a> | " + emailnr + "FN xxxxxxx</span><br /><span style='color: #043381;font-size:12px'><i>" + Ausschusstext + "</i></span><br /><span style='color: #043381;font-size:12px'><i>" + Ausschusstext2 + "</i></span><br /><span style='color: #043381;font-size:12px'><i>" + Ausschusstext3 + "</i></span><br /><span style='color: #043381;font-size:12px'><i>" + Ausschusstext4 + "</i></span><br />", username, password)
+            htmlbody = String.Format("Dear, {0},<br /><br /> Please follow the Link to reset your password:<br /><br />" + Environment.NewLine + "<a runat=" + "server" + " href=http://" + getdomianenvironment + "/login/ChangePW.aspx?Par1=" + VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(tokenname) + ">http://" + getdomianenvironment + ServPort + "/login/ChangePW.aspx?Par1=" + VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(tokenname) + "</a>" + Environment.NewLine + "<br /><br /><br />Kind regards, <br /><span style='color: #043381'><b>VERAG | EDV Support</b></span><br /><span style='color: #043381'>VERAG Spedition AG | A 4975 Suben, Nr. 100</span><br /><span style='color: #043381'>T.<a href='tel:+43 7711 2777-xx'>+43 7711 2777-xx</a> |<a href='mailto:@support@verag.ag'>support@verag.ag</a> | " + emailnr + "FN xxxxxxx</span><br /><span style='color: #043381;font-size:12px'><i>" + Ausschusstext + "</i></span><br /><span style='color: #043381;font-size:12px'><i>" + Ausschusstext2 + "</i></span><br /><span style='color: #043381;font-size:12px'><i>" + Ausschusstext3 + "</i></span><br /><span style='color: #043381;font-size:12px'><i>" + Ausschusstext4 + "</i></span><br />", username, password)
         ElseIf String.IsNullOrWhiteSpace(HttpContext.Current.Request.ServerVariables("SERVER_NAME")) = True Then
             'MsgBox("Error09:" + Environment.NewLine + "The Domain could not be vaildated. Check Link please or contact the Administrator of the program.")
             lblMessage.ForeColor = Color.OrangeRed
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index 91d2094..7de4d99 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -283,28 +283,28 @@
                                </tr>                           
                                 <tr style="color:#003680; height:46px;">
                                         <td align="left">                                                                           
-                                            <asp:TextBox ID="CustomerID" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="txt_checkUID" OnTextChanged="CustomerID_TextChanged" Width="320" Text="User-ID" style="margin-left: 22px" Font-Size="1.25em"></asp:TextBox>                                             
+                                            <asp:TextBox ID="CustomerID" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="txt_checkUID" OnTextChanged="CustomerID_TextChanged" Width="320" Placeholder="User-ID" Text="User-ID" style="margin-left: 22px" OnClick="this.value='';" Font-Size="1.25em"></asp:TextBox>                                             
                                             <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="CustomerID" SetFocusOnError="false" ValidationGroup="txt_checkUID" ErrorMessage="Please enter the User-ID."></asp:RequiredFieldValidator>                                      
                                             <asp:RegularExpressionValidator ID="valid_getNumberInput" ControlToValidate="CustomerID" ValidationGroup="txt_checkUID" runat="server" Display="Dynamic" SetFocusOnError="false" ValidationExpression="[0-9]{4,10}"></asp:RegularExpressionValidator>
                                         </td>
                                 </tr>  
                                 <tr style="color:#003680; height:46px;">  
                                      <td align="left" colspan="2">                                                                       
-                                        <asp:TextBox ID="UserName" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width = "320" ValidationGroup="txt_Username" required="true" Font-Size="1.25em"  style="margin-left:22px;color:#003680" OnClick="this.value='';" Text="Username" ></asp:TextBox>                                                
+                                        <asp:TextBox ID="UserName" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width = "320" ValidationGroup="txt_Username" required="true" Font-Size="1.25em"  style="margin-left:22px;color:#003680" OnClick="this.value='';" Text="Username" Placeholder="Username" ></asp:TextBox>                                                
                                        <asp:RequiredFieldValidator ID="UserNamerequired" runat="server" ControlToValidate="UserName" ErrorMessage="Please enter the  Username." ToolTip="The Username is required." ValidationGroup="txt_Username"></asp:RequiredFieldValidator> 
                                    <asp:RegularExpressionValidator ID="check_UserName_regex" ControlToValidate="UserName" ValidationGroup="txt_check_username" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z]{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="chk_PWField" MaxLength="30" AutoCompleteType="Enabled" CausesValidation="true" style="margin-left:22px;color:#003680" OnClick="this.value='';" Text="Password"></asp:TextBox>                                    
+                                        <asp:TextBox ID="Password" runat="server" CssClass="bg-key-icon" TextMode="Password" required="true" Width = "320" Font-Size="1.25em" ValidationGroup="chk_PWField" MaxLength="30" AutoCompleteType="Enabled" CausesValidation="true" style="margin-left:22px;color:#003680" OnClick="this.value='';" Placeholder="Password"></asp:TextBox>                                    
                                          <asp:RequiredFieldValidator ID="Passwordrequired" runat="server" ControlToValidate="Password" ErrorMessage="Password is needed to authenticate." ToolTip="Please enter the Password." ValidationGroup="chk_PWField"></asp:RequiredFieldValidator>                                                                    
                                          <asp:RegularExpressionValidator ID="checkpwdREGEX" ControlToValidate="Password" ValidationGroup="chk_PWField" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]){4,35}$"></asp:RegularExpressionValidator>
                                      </td>
                                  </tr>       
                          <tr style="color:#003680; height:23px;">
                                       <td align="left" colspan="2">
-                                         <asp:Button ID="LoginButton" runat="server" CommandName="Login" BorderStyle="None" Text="Login" ValidationGroup="Login1" target="_top" OnClientClick="bust2()" Width="330px" 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="Login1" 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:23px;">
@@ -313,7 +313,7 @@
                                       </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:23px">
@@ -334,7 +334,7 @@
                                </tr>                           
                                 <tr style="color:#003680; height:86px">
                                         <td align="left">                                                                           
-                                            <asp:TextBox ID="CustomerID_M" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="txt_checkUID_M" OnTextChanged="CustomerID_TextChanged" Width="325" Text="User-ID" Font-Size="2.025em" OnClick="this.value='';" style="margin-left: 22px;margin-top:20px;"></asp:TextBox>                                             
+                                            <asp:TextBox ID="CustomerID_M" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="txt_checkUID_M" OnTextChanged="CustomerID_TextChanged" Width="325" Placeholder="User-ID" Font-Size="2.025em" OnClick="this.value='';" style="margin-left: 22px;margin-top:20px;" Text="User-ID"></asp:TextBox>                                             
                                             <asp:RequiredFieldValidator ID="CustomerID_M_required" runat="server" ControlToValidate="CustomerID_M" SetFocusOnError="false" ValidationGroup="txt_checkUID_M" ErrorMessage="Please enter the User-ID."></asp:RequiredFieldValidator>                                      
                                             <asp:RegularExpressionValidator ID="valid_getNumber_M_Input" ControlToValidate="CustomerID_M" ValidationGroup="txt_checkUID_M" runat="server" Display="Dynamic" SetFocusOnError="false" ValidationExpression="[0-9]{4,10}"></asp:RegularExpressionValidator>
                                         </td>
@@ -350,14 +350,14 @@
                                 </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="chk_PWField" MaxLength="30" AutoCompleteType="Enabled" CausesValidation="true" style="margin-left:22px;color:#003680" OnClick="this.value='';" Text="Password"></asp:TextBox>                                    
+                                        <asp:TextBox ID="Password_M" runat="server" CssClass="bg-key-icon" TextMode="Password" required="true" Width = "325" Font-Size="2.025em" ValidationGroup="chk_PWField" MaxLength="30" AutoCompleteType="Enabled" CausesValidation="true" style="margin-left:22px;color:#003680" OnClick="this.value='';" Placeholder="Password" Text="Password"></asp:TextBox>                                    
                                          <asp:RequiredFieldValidator ID="Passwordrequired_M" runat="server" ControlToValidate="Password_M" ErrorMessage="Password is needed to authenticate." ToolTip="Please enter the Password." ValidationGroup="chk_PWField"></asp:RequiredFieldValidator>                                                                    
                                          <asp:RegularExpressionValidator ID="checkpwd_M_REGEX" ControlToValidate="Password_M" ValidationGroup="chk_PWField_M" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]){4,35}$"></asp:RegularExpressionValidator>
                                      </td>
                                  </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" ValidationGroup="Login1" target="_top" OnClientClick="bust2()" Width="330px" 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="Login1" 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;">
@@ -365,7 +365,7 @@
                                            <asp:CheckBox ID="RememberMe_M" runat="server" style="margin-left:22px;"/><label for="RememberMe_M" id="lbl_for_chkbox">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 fb582a2..3fcec71 100644
--- a/login/login_FLEX.aspx.vb
+++ b/login/login_FLEX.aspx.vb
@@ -62,13 +62,14 @@ Partial Class login_FLEX
     End Sub
 
     Protected Sub LoginButton_Click(sender As Object, e As EventArgs)
-        Validate()
+        Page.Validate()
     End Sub
 
     Protected Sub CustomerID_TextChanged(sender As Object, e As EventArgs)
 
     End Sub
     Protected Sub Username_M_TextChanged(sender As TextBox, e As EventArgs)
+
         If sender.Text = "" Then
             sender.Text = "ID"
         End If