diff --git a/login/ChangePW.aspx b/login/ChangePW.aspx
index 995309b..8e3733f 100644
--- a/login/ChangePW.aspx
+++ b/login/ChangePW.aspx
@@ -82,9 +82,9 @@
             padding-left: 28px;
             padding-right: 50px;
             width: 227px;
-            height: 28px;
+            height: 32px;
             border: 1px gray solid;
-            border-radius: 5px 5px 0px 0px;
+            border-radius: 5px 5px 5px 5px;
             margin-left: -4px;
             }
             @media (max-width: 558.98px) {
@@ -106,9 +106,9 @@
                     justify-content: center;
                     align-items: center;
                     width: 400px;
-                    height: 613px;
+                    height: 513px;
                     margin: 0 auto;
-                    margin-top: 250px;                    
+                    margin-left:10%;                
                 }
 
                 .container-fluid {                    
@@ -175,12 +175,12 @@
                             </td>
                          </tr>
                       
-                        <tr style="color:#003680;height:36.67px;">
+                        <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:20px;">
+                              <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>
                                 <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>                                
diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 2a8ef7f..330bab1 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -83,11 +83,11 @@
         width: 400px;
         height: 613px;
         background-color: rgba(255,255,255,0.5);
-         top:50%;
-         bottom: auto;
-         left: -5px;
-         right: 520px;
-         margin: auto;
+        top:50%;
+        bottom: auto;
+        left: -5px;
+        right: 520px;
+        margin: auto;
     }
 
     #tbl_main_M {
@@ -163,7 +163,7 @@
         width: 227px;
         height: 32px;
         border: 1px gray solid;
-        border-radius: 5px 5px 0px 0px;
+        border-radius: 5px 5px 5px 5px;
     }
 
     .bg-user-icon {
@@ -173,7 +173,7 @@
         width: 227px;
         height: 32px;
         border: 1px gray solid;
-        border-radius: 5px 5px 0px 0px;
+        border-radius: 5px 5px 5px 5px;
     }
 
     .bg-key-icon {
@@ -183,7 +183,7 @@
         width: 227px;
         height: 32px;
         border: 1px gray solid;
-        border-radius: 5px 5px 0px 0px;
+        border-radius: 5px 5px 5px 5px;
         margin-left: -4px;
     }
 
@@ -195,7 +195,7 @@
         width: 207px;
         height: 32px;
         border: 1px gray solid;
-        border-radius: 5px 5px 0px 0px;
+        border-radius: 5px 5px 5px 5px;
     }
 
     #RememberMe_M {
@@ -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" Text="E-Mail" CssClass="bg-email-icon" style="margin-left:45px;color:#003680" OnClick="this.value='';"/>                    
+                        <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: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"></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>
                     </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" Text="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" OnClick="this.value='';" />
                      <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,14 +325,14 @@
                     </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" Text="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;" OnClick="this.value='';"/>                    
                         <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>
                     </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" Text="Username" Font-Size="2.025em" Width="325px" style="margin-left:25px;color:#003680" OnClick="this.value='';" />
+                    <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>
                      </td></tr>
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index 45d158e..d07db12 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -51,7 +51,7 @@ Partial Class login_ForgotPW
             ' MsgBox("3" + email + " " + username)
 
             'Mobil
-        ElseIf txtEmail.Text = "E-Mail" And txt_Username.Text = "Username" And Not txtEmail_M.Text = "E-Mail" And Not txt_Username_M.Text = "Username" And String.IsNullOrEmpty(txtEmail_M.Text) = False And String.IsNullOrEmpty(txt_Username_M.Text) = False Then
+        ElseIf txtEmail.Text = "E-Mail" And txt_Username.Attributes.Item("Username") And Not txtEmail_M.Text = "E-Mail" And Not txt_Username_M.Attributes.Item("Placeholder") = "Username" And String.IsNullOrEmpty(txtEmail_M.Text) = False And String.IsNullOrEmpty(txt_Username_M.Text) = False Then
             valreqtxtEmail_M.Enabled = True
             regexval_2_txt_Email_M.Enabled = True
             regexval_txt_Email.Enabled = False
@@ -109,12 +109,12 @@ Partial Class login_ForgotPW
                         password = dr("Password").ToString()
                         email = dr("Email").ToString()
                         Try
-                            If txt_Username.Text = dr("Username").ToString() AndAlso txt_Username_M.Text = "Username" Then
+                            If txt_Username.Text = dr("Username").ToString() AndAlso txt_Username_M.Attributes.Item("Placeholder") = "Username" Then
                                 check_UserName_regex_M.Enabled = False
                                 check_UserName_regex.Enabled = True
                                 check_UserName_regex.IsValid = True
                                 username = txt_Username.Text
-                            ElseIf txt_Username_M.Text = dr("Username").ToString() AndAlso txt_Username.Text = "Username" Then
+                            ElseIf txt_Username_M.Text = dr("Username").ToString() AndAlso txt_Username.Attributes.Item("Placeholder") = "Username" Then
                                 check_UserName_regex.Enabled = False
                                 check_UserName_regex_M.Enabled = True
                                 check_UserName_regex_M.IsValid = True
@@ -128,14 +128,14 @@ Partial Class login_ForgotPW
                                 check_UserName_regex.ErrorMessage = "No valid Username found in out database!"
                                 check_UserName_regex.IsValid = False
                             End If
-                            If (txtEmail.Text = dr("Email").ToString() AndAlso txtEmail_M.Text = "E-mail") Then
+                            If (txtEmail.Text = dr("Email").ToString() AndAlso txtEmail_M.Attributes.Item("Placeholder") = "E-mail") Then
                                 regexval_txt_Email_M.Enabled = False
                                 regexval_txt_Email.Enabled = True
                                 regexval_txt_Email.Validate()
                                 email = txtEmail.Text
                                 lblMessage.ForeColor = Color.Green
                                 lblMessage.Text = "The given e-mail exists in our database."
-                            ElseIf (txtEmail_M.Text = dr("Email").ToString() And txtEmail.Text = "E-mail") Then
+                            ElseIf (txtEmail_M.Text = dr("Email").ToString() And txtEmail.Attributes.Item("Placeholder") = "E-mail") Then
                                 regexval_txt_Email_M.Validate()
                                 email = txtEmail_M.Text
                                 lblMessage_M.ForeColor = Color.Green
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index 7de4d99..16ef8f1 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -187,7 +187,7 @@
         width: 227px;
         height: 38px;
         border: 1px gray solid;
-        border-radius: 5px 5px 0px 0px;
+        border-radius: 5px 5px 5px 5px;
     }
 
     .bg-user-icon {
@@ -197,7 +197,7 @@
         width: 227px;
         height: 38px;
         border: 1px gray solid;
-        border-radius: 5px 5px 0px 0px;
+        border-radius: 5px 5px 5px 5px;
     }
 
     .bg-key-icon {
@@ -207,7 +207,7 @@
         width: 227px;
         height: 38px;
         border: 1px gray solid;
-        border-radius: 5px 5px 0px 0px;
+        border-radius: 5px 5px 5px 5px;
         margin-left: -4px;
     }
 
@@ -219,7 +219,7 @@
         width: 207px;
         height: 38px;
         border: 1px gray solid;
-        border-radius: 5px 5px 0px 0px;
+        border-radius: 5px 5px 5px 5px;
     }    
    
     #Login1_btn_ForgotPW_M{
@@ -283,14 +283,14 @@
                                </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" Placeholder="User-ID" Text="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" 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" 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" OnClick="this.value='';" 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>
@@ -325,8 +325,8 @@
                                 </table>
                 </div>
                       <!--Smartphone-Bildschirme-->   
-                                       <div class="d-md-none"> 
-                                            <table id="tbl_main_M" cellpadding="0" style="margin: 4px 0px 4px 4px;border:none">
+                       <div class="d-md-none"> 
+                           <table id="tbl_main_M" cellpadding="0" style="margin: 4px 0px 4px 4px;border:none">
                              <tr style="color:#003680; height:30px;">
                                <td align="left" style="color:#fff;font-kerning:auto;"> 
                                            <asp:Label ID="lbl_login_M" runat="server" Text="Login" style=" color: #003680;font-size: 2.320901320901321em; font-weight: 800; margin-left:132px;margin-top:20px"></asp:Label> 
@@ -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" Placeholder="User-ID" Font-Size="2.025em" OnClick="this.value='';" style="margin-left: 22px;margin-top:20px;" Text="User-ID"></asp:TextBox>                                             
+                                            <asp:TextBox ID="CustomerID_M" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="txt_checkUID_M" Width="325" Placeholder="User-ID" Font-Size="2.025em" OnClick="this.value='';" style="margin-left: 22px;margin-top:20px;"></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>
@@ -342,7 +342,7 @@
                                 <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="txt_Username" Placeholder="Username" required="true" Font-Size="2.025em"  style="margin-left:22px;color:#003680" OnTextChanged="Username_M_TextChanged" OnClick="this.value='';" Text="Username"></asp:TextBox>                                                
+                                        <asp:TextBox id="UserName_M" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width = "325" ValidationGroup="txt_Username" Placeholder="Username" required="true" Font-Size="2.025em"  style="margin-left:22px;color:#003680" OnTextChanged="Username_M_TextChanged" OnClick="this.value='';"></asp:TextBox>                                                
                                      
             <asp:RequiredFieldValidator ID="UserName_M_required" runat="server" ControlToValidate="UserName_M" ErrorMessage="Please enter the  Username." ToolTip="The Username is required." ValidationGroup="txt_Username"></asp:RequiredFieldValidator> 
                                    <asp:RegularExpressionValidator ID="check_UserName_M_regex" ControlToValidate="UserName_M" ValidationGroup="txt_check_username" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z]{4,30})$"></asp:RegularExpressionValidator>
diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb
index 3fcec71..c8ae699 100644
--- a/login/login_FLEX.aspx.vb
+++ b/login/login_FLEX.aspx.vb
@@ -64,14 +64,4 @@ Partial Class login_FLEX
     Protected Sub LoginButton_Click(sender As Object, e As EventArgs)
         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
-    End Sub
 End Class