diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 0c5112a..a8ec552 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -291,7 +291,7 @@
                 <asp:Label ID="lblMessage" runat="server" />
                     </td></tr>                
                 <tr style="color:#003680; height:30px;"><td>    
-                     <asp:Button ID="btn_Send" runat="server" Text="Send" Width="300px" Enabled="true" AutoPostBack="True" Font-Size="22px" style="margin-left:22px;border:none" OnClick="btn_Send_Click" Height="37px" />          
+                     <asp:Button ID="btn_Send" runat="server" Text="Send" Width="300px" Enabled="true"  AutoPostBack="True" Font-Size="22px" style="margin-left:22px;border:none" OnClick="btn_Send_Click"/>          
                                     </td></tr> 
                 <tr><td>                    
                     </td></tr>
@@ -333,7 +333,7 @@
                 <asp:Label ID="lblMessage_M" Font-Size="24px" runat="server" />
                     </td></tr>                
                 <tr style="color:#003680; height:40px;"><td>        
-                    <asp:Button ID="btn_Send_M" runat="server" Text="Send" Width="325px" Enabled="true"  AutoPostBack="True" Font-Size="22px" style="margin-left:22px;border:none" OnClick="btn_Send_Click" Height="37px" />           
+                    <asp:Button ID="btn_Send_M" runat="server" Text="Send" Width="325px" Enabled="true" AutoPostBack="True" Font-Size="22px" style="margin-left:22px;border:none" OnClick="btn_Send_Click" Height="37px" />           
                 
                                     </td></tr> 
                 <tr><td>                    
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index f454113..e5075e3 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -40,6 +40,7 @@ Partial Class ForgotPW
                 check_UserName_regex_M.Enabled = False
                 CustomerID_M_required.Enabled = False
                 valid_getNumber_M_Input.Enabled = False
+                regexval_txt_Email_M.Enabled = False
 
                 valreqtxtusername.Enabled = True
                 valreqtxtEmail.Enabled = True
@@ -49,18 +50,38 @@ Partial Class ForgotPW
                 CustomerIDrequired.Enabled = True
                 valid_getNumberInput.Enabled = True
 
+
+                valreqtxtEmail.Validate()
+                If valreqtxtEmail.IsValid = True Then
+                    regexval_txt_Email.Validate()
+                    If regexval_txt_Email.IsValid = False Then
+                        regexval_txt_Email.ForeColor = Drawing.Color.OrangeRed
+                        regexval_txt_Email.ErrorMessage = "Annotation: The Domain does not match."
+                        regexval_txt_Email.Validate()
+                        If regexval_txt_Email_2.IsValid = True Then
+                            email = txtEmail.Text
+                            regexval_txt_Email_2.ForeColor = Drawing.Color.Lime
+                            regexval_txt_Email_2.ErrorMessage = "E-mail Address valid."
+                        End If
+                    Else
+                        regexval_txt_Email.Validate()
+                        If regexval_txt_Email_2.IsValid = True Then
+                            regexval_txt_Email_2.ForeColor = Drawing.Color.Lime
+                            regexval_txt_Email_2.ErrorMessage = "E-mail Address valid."
+                            email = txtEmail_M.Text
+                        End If
+                    End If
+                End If
+
                 CustomerIDrequired.Validate()
                 If CustomerIDrequired.IsValid = True Then
-                    valid_getNumber_M_Input.Validate()
+                    valid_getNumberInput.Validate()
                     If valid_getNumberInput.IsValid = True Then
                         customerID = txt_CustomerID.Text
                     Else
                         valid_getNumberInput.ForeColor = Drawing.Color.Red
                         valid_getNumberInput.ErrorMessage = "Customer-ID is not numeric or too long."
                     End If
-                Else
-                    valid_getNumberInput.ForeColor = Drawing.Color.Red
-                    valid_getNumberInput.ErrorMessage = "Customer-ID is not given."
                 End If
 
                 valreqtxtusername.Validate()
@@ -74,34 +95,7 @@ Partial Class ForgotPW
                         check_UserName_regex.ForeColor = Drawing.Color.Lime
                         check_UserName_regex.ErrorMessage = "Valid Username has been entered."
                     End If
-                Else
-                    valreqtxtusername.ForeColor = Drawing.Color.Lime
-                    check_UserName_regex.ErrorMessage = "A too long Username has been entered."
                 End If
-
-                valreqtxtEmail.Validate()
-                If valreqtxtEmail.IsValid = True Then
-                    regexval_txt_Email.Validate()
-                    If regexval_txt_Email.IsValid = False Then
-                        regexval_txt_Email.ForeColor = Drawing.Color.OrangeRed
-                        regexval_txt_Email.ErrorMessage = "Annotation: The Domain does not match."
-                        regexval_txt_Email_2.Validate()
-                        If regexval_txt_Email_2.IsValid = True Then
-                            email = txtEmail.Text
-                            regexval_txt_Email.ForeColor = Drawing.Color.Lime
-                            regexval_txt_Email.ErrorMessage = "E-mail Address valid."
-                        End If
-                    Else
-                        regexval_txt_Email.Validate()
-                        If valreqtxtEmail.IsValid = True Then
-                            valreqtxtEmail.ForeColor = Drawing.Color.Lime
-                            valreqtxtEmail.ErrorMessage = "E-mail Address valid."
-                            email = txtEmail.Text
-                        End If
-                    End If
-                End If
-
-
                 ' MsgBox("3" + email + " " + username)
             End If
             'Mobil
@@ -115,6 +109,7 @@ Partial Class ForgotPW
                 valid_getNumberInput.Enabled = False
 
                 regexval_2_txt_Email_M.Enabled = True
+                regexval_txt_Email_M.Enabled = True
                 valreqtxtEmail_M.Enabled = True
                 valreqtxtusername_M.Enabled = True
                 check_UserName_regex_M.Enabled = True
@@ -123,21 +118,21 @@ Partial Class ForgotPW
 
                 valreqtxtEmail_M.Validate()
                 If valreqtxtEmail_M.IsValid = True Then
-                    regexval_txt_Email.Validate()
-                    If regexval_txt_Email.IsValid = False Then
-                        regexval_txt_Email.ForeColor = Drawing.Color.OrangeRed
-                        regexval_txt_Email.ErrorMessage = "Annotation: The Domain does not match."
-                        regexval_txt_Email.Validate()
+                    regexval_txt_Email_M.Validate()
+                    If regexval_txt_Email_M.IsValid = False Then
+                        valreqtxtEmail_M.ForeColor = Drawing.Color.OrangeRed
+                        regexval_txt_Email_M.ErrorMessage = "Annotation: The Domain does not match."
+                        regexval_txt_Email_M.Validate()
                         If regexval_2_txt_Email_M.IsValid = True Then
                             email = txtEmail_M.Text
-                            regexval_txt_Email.ForeColor = Drawing.Color.Lime
-                            regexval_txt_Email.ErrorMessage = "E-mail Address valid."
+                            regexval_txt_Email_M.ForeColor = Drawing.Color.Lime
+                            regexval_txt_Email_M.ErrorMessage = "E-mail Address valid."
                         End If
                     Else
                         regexval_txt_Email.Validate()
                         If regexval_2_txt_Email_M.IsValid = True Then
-                            regexval_txt_Email.ForeColor = Drawing.Color.Lime
-                            regexval_txt_Email.ErrorMessage = "E-mail Address valid."
+                            regexval_txt_Email_M.ForeColor = Drawing.Color.Lime
+                            regexval_txt_Email_M.ErrorMessage = "E-mail Address valid."
                             email = txtEmail_M.Text
                         End If
                     End If
@@ -152,9 +147,6 @@ Partial Class ForgotPW
                         valid_getNumber_M_Input.ForeColor = Drawing.Color.Red
                         valid_getNumber_M_Input.ErrorMessage = "Customer-ID is not numeric or too long."
                     End If
-                Else
-                    valid_getNumber_M_Input.ForeColor = Drawing.Color.Red
-                    valid_getNumber_M_Input.ErrorMessage = "Customer-ID is not given."
                 End If
 
                 valreqtxtusername_M.Validate()
@@ -168,9 +160,6 @@ Partial Class ForgotPW
                         check_UserName_regex_M.ForeColor = Drawing.Color.Lime
                         check_UserName_regex_M.ErrorMessage = "Valid Username has been entered."
                     End If
-                Else
-                    check_UserName_regex_M.ForeColor = Drawing.Color.Lime
-                    check_UserName_regex_M.ErrorMessage = "A too long Username has been entered."
                 End If
             Else
                 'MsgBox("The form has not been filled completeley.", MsgBoxStyle.Critical, "Error08")