diff --git a/login/Email.html b/login/Email.html
deleted file mode 100644
index 50e7efe..0000000
--- a/login/Email.html
+++ /dev/null
@@ -1,11 +0,0 @@
-﻿<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-</head>
-<body>
-    Dear {0},<br /><br /> Please follow the Link to reset your password:<br /><br />" + Environment.NewLine + "<a runat=" + " server" + " href=http://" + getdomianenvironment + ServPort + "/login/Change_PW.aspx?Par1=" + tokenname + "&Par2=" + VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(username) + "&Par3=" + VERAG_PROG_ALLGEMEIN.cCryptography2.Encrypt(customerID) + "&Mob=" + VERAG_PROG_ALLGEMEIN.cCryptography2.Encrypt("False") + "&Par4=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(theUserID) + ">http://" + getdomianenvironment + ServPort + "/login/ChangePW.aspx?Par1=" + VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(tokenname) + "&Par2=" + VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(username) + "&Par3=" + VERAG_PROG_ALLGEMEIN.cCryptography2.Encrypt(customerID) + "&Mob=" + VERAG_PROG_ALLGEMEIN.cCryptography2.Encrypt("False") + "&Par4=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(theUserID) + "</a>" + Environment.NewLine + <br /><br />Notice:<br /><span style='color: #043381;font-size:14px'><i>The Link is valid for 30 minutes until + Space(1) + Date.Now.AddMinutes(30).ToString() + Space(1) + "only!</i></span><br / ><br /><br />Kind regards, <br /><span style='color: #043381'><b>VERAG | EDV Support</b></span><br /><span>" + mailpic + "</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.IsNullOrEmpty(HttpContext.Current.Request.ServerVariables("SERVER_NAME"))=False Then
-</body>
-</html>
\ No newline at end of file
diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index c86e0ae..7d33068 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -344,12 +344,12 @@
                </td></tr>
                <tr style="color:#003680; height:38px;"><td colspan="2">
                        <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;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" Font-Size="1.125em"></asp:TextBox>                                             
-                       <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="txt_CustomerID" SetFocusOnError="true" ForeColor="Red" Text="" ErrorMessage="*" ValidationGroup="val-desk"></asp:RequiredFieldValidator>
+                       <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="txt_CustomerID" SetFocusOnError="true" ForeColor="Red" Text="*" ErrorMessage="*" ValidationGroup="val-desk"></asp:RequiredFieldValidator>
                     </td></tr>
                 <tr style="color:#003680; height:38px;">                                 
                     <td align="left" colspan="2">  
                         <asp:TextBox ID="txtEmail" runat="server" Width="265" ValidationGroup="val-desk" ForeColor="Red" Font-Size="1.125em" Placeholder="E-Mail" CssClass="bg-email-icon" style="margin-left:45px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"/>                    
-                        <asp:RequiredFieldValidator ID="valreqtxtEmail" ControlToValidate="txtEmail" SetFocusOnError="true" ValidationGroup="val-desk" runat="server" Text="" ErrorMessage="*" ForeColor="Red"></asp:RequiredFieldValidator>                                                  
+                        <asp:RequiredFieldValidator ID="valreqtxtEmail" ControlToValidate="txtEmail" SetFocusOnError="true" ValidationGroup="val-desk" runat="server" Text="*" ErrorMessage="*" ForeColor="Red"></asp:RequiredFieldValidator>                                                  
                     </td></tr>
                 <tr style="color:#003680; height:38px;">                                
                      <td align="left" colspan="2"> 
@@ -361,9 +361,9 @@
                                     </td></tr> 
                 <tr style="color:#003680; height:38px;width:214px">
                 <td align="right" colspan="2" style="width:214px">                    
-                <asp:Label ID="lblMessage" runat="server" style="margin-left:30px"/>
+                <asp:Label ID="lblMessage" runat="server" Font-Size="19px" />
                     <asp:RegularExpressionValidator ID="valid_getNumberInput" ControlToValidate="txt_CustomerID" style="font-size:17px" ForeColor="Red" ValidationGroup="val-desk" runat="server" Display="Dynamic" SetFocusOnError="false" ErrorMessage="The Customer-ID is not valid." ValidationExpression="[0-9]{1,10}"></asp:RegularExpressionValidator>
-                    <asp:RegularExpressionValidator ID="check_UserName_regex" ErrorMessage="The Username don't meet the requirements. Try again." ControlToValidate="txt_Username" ValidationGroup="val-desk" runat="server" Display="Dynamic" SetFocusOnError="false" ForeColor="Red" ValidationExpression="([a-zA-Z1-9]{4,30})"></asp:RegularExpressionValidator>
+                    <asp:RegularExpressionValidator ID="check_UserName_regex" ErrorMessage="The Username don't meet the requirements. Try again." ControlToValidate="txt_Username" ValidationGroup="val-desk" runat="server" Display="Dynamic" SetFocusOnError="true" ForeColor="Red" ValidationExpression="([a-zA-Z1-9]{4,30})"></asp:RegularExpressionValidator>
                     <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email" ValidationGroup="val-desk" ValidationExpression="[\w\.]{0,2}\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ForeColor="Red" ErrorMessage="The Mail format is not correct!" SetFocusOnError="true"></asp:RegularExpressionValidator>    
                     <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email_2" ValidationGroup="val-desk" ValidationExpression="[\w\.]{0,2}\@(\bverag.ag\b)" Display="Dynamic" SetFocusOnError="true" style="font-size:1em" ErrorMessage="The Domain is not correct." ForeColor="Red"></asp:RegularExpressionValidator>
                 </td></tr>  
@@ -412,11 +412,11 @@
                  </td></tr> 
                 <tr style="color:#003680; height:50px;">
                 <td align="right" colspan="2" style="width:335px">                    
-                <asp:Label ID="lblMessage_M" Font-Size="24px" runat="server" />
+                <asp:Label ID="lblMessage_M" Font-Size="19px" runat="server" />
                     <asp:RegularExpressionValidator ID="valid_getNumber_M_Input" ControlToValidate="txt_CustomerID_M" ValidationGroup="val-mobil" ForeColor="Red" Font-Size="18px" runat="server" style="margin-left:22px;" Display="Dynamic" SetFocusOnError="false" ValidationExpression="[0-9]{1,10}" ErrorMessage="The Customer-ID is not valid."></asp:RegularExpressionValidator>
                     <asp:RegularExpressionValidator ControlToValidate="txtEmail_M" ForeColor="Red" Font-Size="18px"  runat="server" ID="regexval_2_txt_Email_M" ValidationGroup="val-mobil" ValidationExpression="[\w\.]+\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ErrorMessage="This is no valid e-mail address." SetFocusOnError="true"></asp:RegularExpressionValidator>
                     <asp:RegularExpressionValidator ControlToValidate="txtEmail_M" ForeColor="Red" Font-Size="18px" runat="server" ID="regexval_txt_Email_M" ValidationGroup="val-mobil" ValidationExpression="[a-zA-Z]{2}\@(\bverag.ag\b)" Display="Dynamic" ErrorMessage="" SetFocusOnError="true"></asp:RegularExpressionValidator>
-                    <asp:RegularExpressionValidator ID="check_UserName_regex_M" ForeColor="Red" Font-Size="18px" ErrorMessage="Try again. The Username don't meet the rquirements." ControlToValidate="txt_Username_M" ValidationGroup="val-mobil" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="([a-zA-Z1-9]{4,30})"></asp:RegularExpressionValidator>
+                    <asp:RegularExpressionValidator ID="check_UserName_regex_M" ForeColor="Red" Font-Size="18px" ErrorMessage="Try again. The Username don't meet the requirements." ControlToValidate="txt_Username_M" ValidationGroup="val-mobil" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="([a-zA-Z1-9]{4,30})"></asp:RegularExpressionValidator>
                     </td></tr>                      
                 <tr><td>                    
                     </td></tr>
