diff --git a/login/ChangePW.aspx b/login/ChangePW.aspx
index 00bde16..ad8be8b 100644
--- a/login/ChangePW.aspx
+++ b/login/ChangePW.aspx
@@ -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='';" Placeholder="Enter Password"></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" 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,7 +209,7 @@
                               </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='';" Placeholder="Repeat Password"></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" 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" />
diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index baabd60..8c0045e 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -279,14 +279,14 @@
                     </td></tr> -->
                 <tr style="color:#003680; height:40px;">                                 
                     <td align="left" colspan="2">  
-                        <asp:TextBox ID="txtEmail" runat="server" Width="265" ValidationGroup="Valtxtemail" Font-Size="1.125em" Placeholder="E-Mail" CssClass="bg-email-icon" style="margin-left:45px;color:#003680" OnClick="this.value='';"/>                    
-                        <asp:RequiredFieldValidator ID="valreqtxtEmail" ControlToValidate="txtEmail" ValidationGroup="Valtxtemail" runat="server" Text="Require E-Mail Address" ></asp:RequiredFieldValidator>                        
+                        <asp:TextBox ID="txtEmail" runat="server" Width="265" ValidationGroup="Valtxtemail" Font-Size="1.125em" Placeholder="E-Mail" CssClass="bg-email-icon" style="margin-left:45px;color:#003680"/>                    
+                        <asp:RequiredFieldValidator ID="valreqtxtEmail" ControlToValidate="txtEmail" ValidationGroup="Valtxtemail" runat="server" Text="Require E-Mail Address" ForeColor="Red" ></asp:RequiredFieldValidator>                        
                         <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email" ValidationGroup="Valtxtemail" ValidationExpression="[\w\.]+\@(\bverag.ag\b)" Display="Dynamic" ErrorMessage="The E-Mail has not the correct domain!" SetFocusOnError="true" style="font-size:1em" ForeColor="Red"></asp:RegularExpressionValidator>
-                        <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email_2" ValidationGroup="Valtxtemail" ValidationExpression="[\w\.]+\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ErrorMessage="The E-Mail has not the correct domain!" SetFocusOnError="true"></asp:RegularExpressionValidator>
+                        <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email_2" ValidationGroup="Valtxtemail" ValidationExpression="[\w\.]+\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ErrorMessage="The E-Mail has not the correct domain!" ForeColor="Red" SetFocusOnError="true"></asp:RegularExpressionValidator>
                     </td></tr>
                 <tr style="color:#003680; height:30px;">                                
                      <td align="left" colspan="2"> 
-                    <asp:TextBox ID="txt_Username" runat="server" CssClass="bg-user-icon" ValidationGroup="Valtxtusername" Placeholder="Username" Font-Size="1.125em" Width="265" style="margin-left:45px;color:#003680" OnClick="this.value='';" />
+                    <asp:TextBox ID="txt_Username" runat="server" CssClass="bg-user-icon" ValidationGroup="Valtxtusername" Placeholder="Username" Font-Size="1.125em" Width="265" style="margin-left:45px;color:#003680" />
                      <asp:RequiredFieldValidator ID="valreqtxtusername" ControlToValidate="txt_Username" ValidationGroup="Valtxtusername" runat="server" Text="Require Username" ErrorMessage="Please give a Username."></asp:RequiredFieldValidator>           
                          <asp:RegularExpressionValidator ID="check_UserName_regex" ErrorMessage="The Username don't meet the rquirements. Try again." ControlToValidate="txt_Username" ValidationGroup="Valtxtusername" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z1-9]{4,30})$"></asp:RegularExpressionValidator>
                      </td></tr>
@@ -325,16 +325,16 @@
                     </td></tr> -->
                 <tr style="color:#003680; height:190px;">                                 
                     <td align="left" colspan="2">  
-                        <asp:TextBox ID="txtEmail_M" runat="server" Width="325px" ValidationGroup="Valtxtemail_M" Font-Size="2.025em" Placeholder="E-Mail" CssClass="bg-email-icon" style="margin-left:25px;color:#003680;" OnClick="this.value='';"/>                    
+                        <asp:TextBox ID="txtEmail_M" runat="server" Width="325px" ValidationGroup="Valtxtemail_M" Font-Size="2.025em" Placeholder="E-Mail" CssClass="bg-email-icon" style="margin-left:25px;color:#003680;"/>                    
                         <asp:RequiredFieldValidator ID="valreqtxtEmail_M" ControlToValidate="txtEmail" ValidationGroup="Valtxtemail_M" runat="server" Text="Require E-Mail Address" ></asp:RequiredFieldValidator>                        
-                        <asp:RegularExpressionValidator ControlToValidate="txtEmail_M" Font-Size="24px" runat="server" ID="regexval_txt_Email_M" ValidationGroup="Valtxtemail_M" ValidationExpression="[\w\.]+\@(\bverag.ag\b)" Display="Dynamic" ErrorMessage="The E-Mail has not the correct domain!" SetFocusOnError="true"></asp:RegularExpressionValidator>
-                        <asp:RegularExpressionValidator ControlToValidate="txtEmail_M" Font-Size="24px"  runat="server" ID="regexval_2_txt_Email_M" ValidationGroup="Valtxtemail_M" ValidationExpression="[\w\.]+\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ErrorMessage="The E-Mail has not the correct domain!" SetFocusOnError="true"></asp:RegularExpressionValidator>
+                        <asp:RegularExpressionValidator ControlToValidate="txtEmail_M" ForeColor="Red" Font-Size="24px" runat="server" ID="regexval_txt_Email_M" ValidationGroup="Valtxtemail_M" ValidationExpression="[\w\.]+\@(\bverag.ag\b)" Display="Dynamic" ErrorMessage="The E-Mail has not the correct domain!" SetFocusOnError="true"></asp:RegularExpressionValidator>
+                        <asp:RegularExpressionValidator ControlToValidate="txtEmail_M" ForeColor="Red" Font-Size="24px"  runat="server" ID="regexval_2_txt_Email_M" ValidationGroup="Valtxtemail_M" ValidationExpression="[\w\.]+\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ErrorMessage="The E-Mail has not the correct domain!" SetFocusOnError="true"></asp:RegularExpressionValidator>
                     </td></tr>
                 <tr style="color:#003680; height:80px;">                                
                      <td align="left" colspan="2"> 
-                    <asp:TextBox ID="txt_Username_M" runat="server" CssClass="bg-user-icon" ValidationGroup="Valtxtusername_M" Placeholder="Username" Font-Size="2.025em" Width="325px" style="margin-left:25px;color:#003680" OnClick="this.value='';" />
-                     <asp:RequiredFieldValidator ID="valreqtxtusername_M" ControlToValidate="txt_Username_M" ValidationGroup="Valtxtusername_M" runat="server" Text="Require Username" ErrorMessage="Please give a Username."></asp:RequiredFieldValidator>        
-                         <asp:RegularExpressionValidator ID="check_UserName_regex_M" Font-Size="24px" ErrorMessage="The Username don't meet the rquirements. Try again." ControlToValidate="txt_Username_M" ValidationGroup="Valtxtusername" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z1-9]{4,30})$"></asp:RegularExpressionValidator>
+                    <asp:TextBox ID="txt_Username_M" runat="server"  CssClass="bg-user-icon" ValidationGroup="Valtxtusername_M" Placeholder="Username" Font-Size="2.025em" Width="325px" style="margin-left:25px;color:#003680" OnClick="this.value='';" />
+                     <asp:RequiredFieldValidator ID="valreqtxtusername_M" ForeColor="Red" ControlToValidate="txt_Username_M" ValidationGroup="Valtxtusername_M" runat="server" Text="Require Username" ErrorMessage="Please give a Username."></asp:RequiredFieldValidator>        
+                         <asp:RegularExpressionValidator ID="check_UserName_regex_M" ForeColor="Red" Font-Size="24px" ErrorMessage="The Username don't meet the rquirements. Try again." ControlToValidate="txt_Username_M" ValidationGroup="Valtxtusername" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z1-9]{4,30})$"></asp:RegularExpressionValidator>
                      </td></tr>
                 <tr style="color:#003680; height:30px;">
                 <td align="right" colspan="2">                    
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index f2729e2..0086d33 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -283,31 +283,31 @@
                                </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" Width="320" Placeholder="User-ID" style="margin-left: 22px" OnClick="this.value='';" Font-Size="1.25em"></asp:TextBox>                                             
+                                            <asp:TextBox ID="CustomerID" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="txt_checkUID" Width="320" Placeholder="User-ID" style="margin-left: 22px" 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='';" Placeholder="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" 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='';" Placeholder="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" 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;">
+                         <tr style="color:#003680; height:55px;">
                                       <td align="left" colspan="2">
                                          <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;">
+                                 <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;" />
                                       </td>
@@ -316,7 +316,7 @@
                                        <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">
+                                 <tr style="color:#003680; height:16px">
                                       <td align="center" style="color:Red;" colspan="2">
                                            <asp:Literal ID="FailureText" runat="server" EnableViewState="False"></asp:Literal>
                                       </td>