diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 50e1515..0bee5f0 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -257,7 +257,7 @@
             <table id="tbl_main" cellpadding="0" style="margin:4px 4px 4px 4px; border: none;">
                 <tr style="color:#003680;height:35px;">
                                    <td>
-                                       <asp:Button ID="btn_Back" runat="server" Width="265" Text="Back" PostBackUrl="~/login/login_FLEX.aspx" OnClick="btn_Back_Click" style="margin-left:49px;"/>
+                                       <asp:Button ID="btn_Back" runat="server" Width="265" CausesValidation="false" Text="Back" PostBackUrl="~/login/login_FLEX.aspx" OnClick="btn_Back_Click" style="margin-left:49px;"/>
                                    </td>
                                </tr>
                  <tr style="color:#003680; height:32px;font-size:14px">
@@ -273,9 +273,9 @@
             <h2 style="margin-left:94px; margin-top:-4px">Fill in your data here:</h2>
                                              </td></tr>
                <tr><td>
-               <asp:TextBox ID="txt_CustomerID" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="val-desk" Width="265" Placeholder="Customer-ID" style="" Font-Size="1.125em"></asp:TextBox>                                             
-                            <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="txt_CustomerID" ForeColor="Red" SetFocusOnError="true" ValidationGroup="val-desk" ErrorMessage="Please enter the Customer-ID."></asp:RequiredFieldValidator>                                      
-                             <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]{4,10}"></asp:RegularExpressionValidator>
+                       <asp:TextBox ID="txt_CustomerID" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="val-desk" Width="265" Placeholder="Customer-ID" style="margin-left:45px;color:#003680" Font-Size="1.125em"></asp:TextBox>                                             
+                       <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="txt_CustomerID" ForeColor="Red" ValidationGroup="val-desk" ErrorMessage="Please enter the Customer-ID."></asp:RequiredFieldValidator>                                      
+                       <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]{4,10}"></asp:RegularExpressionValidator>
                     </td></tr>
                 <tr style="color:#003680; height:30px;">                                 
                     <td align="left" colspan="2">  
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index a29c669..9df4442 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -37,16 +37,18 @@ Partial Class ForgotPW
                 regexval_2_txt_Email_M.Enabled = False
                 valreqtxtEmail_M.Enabled = False
                 valreqtxtusername_M.Enabled = False
+                check_UserName_regex_M.Enabled = False
+                CustomerID_M_required.Enabled = False
+                valid_getNumber_M_Input.Enabled = False
+
                 valreqtxtusername.Enabled = True
                 valreqtxtEmail.Enabled = True
                 regexval_txt_Email_2.Enabled = True
                 regexval_txt_Email.Enabled = True
                 check_UserName_regex.Enabled = True
-                check_UserName_regex_M.Enabled = False
-                CustomerID_M_required.Enabled = False
                 CustomerIDrequired.Enabled = True
                 valid_getNumberInput.Enabled = True
-                valid_getNumber_M_Input.Enabled = False
+
 
                 valreqtxtEmail.Validate()
 
@@ -119,13 +121,19 @@ Partial Class ForgotPW
             End If
             'Mobil
             If String.IsNullOrEmpty(txtEmail_M.Text) = False And String.IsNullOrEmpty(txt_Username_M.Text) = False And String.IsNullOrEmpty(txt_CustomerID_M.Text) = False And String.IsNullOrEmpty(txtEmail.Text) = True And String.IsNullOrEmpty(txt_Username.Text) = True And String.IsNullOrEmpty(txt_CustomerID.Text) = True Then
-                valreqtxtEmail_M.Enabled = True
-                regexval_2_txt_Email_M.Enabled = True
-                valreqtxtusername_M.Enabled = True
-                regexval_txt_Email.Enabled = False
-                regexval_txt_Email_2.Enabled = False
                 valreqtxtusername.Enabled = False
+                valreqtxtEmail.Enabled = False
+                regexval_txt_Email_2.Enabled = False
+                regexval_txt_Email.Enabled = False
+                check_UserName_regex.Enabled = False
+                CustomerIDrequired.Enabled = False
                 valid_getNumberInput.Enabled = False
+
+                regexval_2_txt_Email_M.Enabled = True
+                valreqtxtEmail_M.Enabled = True
+                valreqtxtusername_M.Enabled = True
+                check_UserName_regex_M.Enabled = True
+                CustomerID_M_required.Enabled = True
                 valid_getNumber_M_Input.Enabled = True
 
                 valreqtxtEmail_M.Validate()
@@ -194,10 +202,15 @@ Partial Class ForgotPW
                     valid_getNumber_M_Input.ForeColor = Drawing.Color.Red
                     valid_getNumber_M_Input.ErrorMessage = "Customer-ID is not given."
                 End If
+            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
 
-                '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 And String.IsNullOrEmpty(customerID) = False Then
+            '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 And String.IsNullOrEmpty(customerID) = False Then
                     If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
                         VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
                         'ConnectionString = "Server=DEVELOPER\DEVSQL;Database=VERAG_HOMEPAGE;Uid=sa;Pwd=BmWr501956"
@@ -312,11 +325,7 @@ Partial Class ForgotPW
                         lblMessage.Text = "An internal password searching error occured in our systems ."
                     End If
                 End If
-            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
+
         Catch Exc As Exception
             lblMessage.Text = "Error08: No input found."
         End Try