diff --git a/login/ChangePW.aspx.vb b/login/ChangePW.aspx.vb
index 6c37a13..2e7a672 100644
--- a/login/ChangePW.aspx.vb
+++ b/login/ChangePW.aspx.vb
@@ -9,13 +9,17 @@ Partial Class ChangePW
         Session.Add("urltochangepw", url)
         If VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("TokenforEmail").ToString()) = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1")) AndAlso VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("TokenforEmail").ToString()) = Not Nothing AndAlso VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1")) = Not Nothing And VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("USerID").ToString()) = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par2")) Then
             If getDateoftoken(VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1"))) = True Then
-                txt_Pw_WH.Enabled = True
-                txt_Pw.Enabled = True
-                regexval_txt_Pw_WH.Enabled = True
-                If IsPostBack Then
-                    reqPasswtxt.Validate()
-                    reqPassw1txt.Validate()
-                End If
+                Try
+                    txt_Pw_WH.Enabled = True
+                    txt_Pw.Enabled = True
+                    regexval_txt_Pw_WH.Enabled = True
+                    If IsPostBack Then
+                        reqPasswtxt.Validate()
+                        reqPassw1txt.Validate()
+                    End If
+                Catch exc As Exception
+                    MsgBox(exc)
+                End Try
             Else
                 btn_submitpw.Enabled = False
                 txt_Pw.BackColor = Drawing.Color.Gray
diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 4cd42b1..8b98a61 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -281,8 +281,8 @@
                     <td align="left" colspan="2">  
                         <asp:TextBox ID="txtEmail" runat="server" Width="265" ValidationGroup="val-desk" Font-Size="1.125em" Placeholder="E-Mail" CssClass="bg-email-icon" style="margin-left:45px;color:#003680"/>                    
                         <asp:RequiredFieldValidator ID="valreqtxtEmail" ControlToValidate="txtEmail" ValidationGroup="val-desk" runat="server" Text="Require E-Mail Address" ForeColor="Red" ></asp:RequiredFieldValidator>                        
-                        <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email" ValidationGroup="val-desk" 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="val-desk" 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>
+                        <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email" ValidationGroup="val-desk" ValidationExpression="[\w\.]{0,2}\@(\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="val-desk" ValidationExpression="[\w\.]{0,2}\@[\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"> 
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index 02d9875..ca7bbd8 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -49,15 +49,17 @@ Partial Class ForgotPW
                     Boolemail_mobile_notempty = False
 
                     If Boolemail_desktop_notempty = True Then
-                        regexval_txt_Email_2.Validate()
-                        If regexval_txt_Email_2.IsValid = True Then
+                        regexval_txt_Email.Validate()
+                        If regexval_txt_Email.IsValid = True Then
                             Boolemail_desktop_regex = True
+                            Boolemail_desktop_regexdomain = True
                             Boolemail_mobile_regex = False
+                            Boolemail_mobile_regexdomain = False
                         End If
                         If Boolemail_desktop_notempty = True AndAlso Boolemail_desktop_regexdomain = True AndAlso Boolemail_desktop_regex = True Then
                             email = txtEmail.Text
                         Else
-                            regexval_txt_Email_2.IsValid = True
+                            regexval_txt_Email.IsValid = True
                             Boolemail_desktop_regex = True
                             Boolemail_mobile_regex = False
                             If Boolemail_desktop_regexdomain = True Then