diff --git a/login/ChangePW.aspx b/login/ChangePW.aspx
index 8e3733f..00bde16 100644
--- a/login/ChangePW.aspx
+++ b/login/ChangePW.aspx
@@ -106,7 +106,7 @@
                     justify-content: center;
                     align-items: center;
                     width: 400px;
-                    height: 513px;
+                    height: 613px;
                     margin: 0 auto;
                     margin-left:10%;                
                 }
@@ -127,7 +127,7 @@
                     font-size: 11px;
                     border: 1px solid gray;
                     width: 300px;
-                    height: 713px;
+                    height: 613px;
                 }
                 #btn_submitpw_M{
                     background-color: #003680;
diff --git a/login/ChangePW.aspx.vb b/login/ChangePW.aspx.vb
index f0d73f9..df2177e 100644
--- a/login/ChangePW.aspx.vb
+++ b/login/ChangePW.aspx.vb
@@ -54,14 +54,14 @@ Partial Class login_ChangePW
         Dim tempstr As String = ""
         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_M.Text) = True AndAlso String.IsNullOrEmpty(txt_Pw_WH_M.Text) = True Then
+        If String.IsNullOrEmpty(txt_Pw.Text) = Not True AndAlso String.IsNullOrEmpty(txt_Pw_WH.Text) = Not True AndAlso txt_Pw_M.Attributes.Item("Placeholder") = "Enter Password" AndAlso txt_Pw_WH_M.Attributes.Item("Placeholder") = "Repeat Password" Then
 
             reqPasswtxt.Validate()
             reqPassw1txt.Validate()
             reqPassw1txt_M.Enabled = False
             reqPasswtxt.Enabled = False
             tempstr = txt_Pw.Text
-        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
+        ElseIf String.IsNullOrEmpty(txt_Pw.Text) = True AndAlso String.IsNullOrEmpty(txt_Pw_WH.Text) = True AndAlso txt_Pw.Attributes.Item("Placeholder") = Not True AndAlso txt_Pw_WH.Attributes.Item("Placeholder") = "Repeat Password" AndAlso txt_Pw.Attributes.Item("Placeholder") = "Repeat Password" Then
 
             reqPasswtxt.Enabled = False
             reqPassw1txt.Enabled = False
diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 330bab1..baabd60 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -281,7 +281,7 @@
                     <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: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" 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>
                     </td></tr>
                 <tr style="color:#003680; height:30px;">                                
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index d07db12..345b9a0 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -19,7 +19,7 @@ Partial Class login_ForgotPW
         Dim password As String = String.Empty
         Dim email As String = String.Empty
         Dim tokenname As String = String.Empty
-        If txtEmail_M.Text = "E-Mail" And txt_Username_M.Text = "Username" And Not txtEmail.Text = "E-Mail" And Not txt_Username.Text = "Username" And String.IsNullOrEmpty(txtEmail.Text) = False And String.IsNullOrEmpty(txt_Username.Text) = False Then
+        If txtEmail_M.Text = "E-Mail" And txt_Username_M.Text = "Username" And Not txtEmail.Attributes.Item("Placeholer") = "E-Mail" And Not txt_Username.Attributes.Item("Placeholer") = "Username" And String.IsNullOrEmpty(txtEmail.Text) = False And String.IsNullOrEmpty(txt_Username.Text) = False Then
             regexval_2_txt_Email_M.Enabled = False
             valreqtxtEmail_M.Enabled = False
             valreqtxtusername_M.Enabled = False
@@ -82,6 +82,7 @@ Partial Class login_ForgotPW
             End If
 
         End If
+
         'Erweiterte Degub Msg-Box
         'MsgBox("Userdaten in App" + Environment.NewLine + email + Environment.NewLine + username + Environment.NewLine + "Userdaten desktop" + txt_Username.Text + Environment.NewLine + txtEmail.Text + Environment.NewLine + "Userdaten Mobil:" + Environment.NewLine + txtEmail_M.Text + Environment.NewLine + txt_Username_M.Text)
         If String.IsNullOrEmpty(email) = False And String.IsNullOrEmpty(tokenname) = True And String.IsNullOrEmpty(password) = True And String.IsNullOrEmpty(username) = False Then
@@ -207,8 +208,8 @@ Partial Class login_ForgotPW
         Else
             'MsgBox("The form has not been filled completeley.", MsgBoxStyle.Critical, "Error08")
             lblMessage.ForeColor = Color.Red
-                lblMessage.Text = "The form has not been filled completeley."
-            End If
+            lblMessage.Text = "The form has not been filled completeley."
+        End If
 
     End Sub
 
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index 16ef8f1..f2729e2 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -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='';"></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" 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>