diff --git a/css/login/ForgotPW.css b/css/login/ForgotPW.css
index c73d433..b95e018 100644
--- a/css/login/ForgotPW.css
+++ b/css/login/ForgotPW.css
@@ -10,17 +10,6 @@
     overflow-y: clip;
     overflow-x: clip;
 }
-.container-fluid {
-    width: 500px;
-    height: 473px;
-    position: absolute;
-    background-color: rgba(255,255,255,0.5);
-    top: 50%;
-    bottom: 50%;
-    left: 50%;
-    right: 50%;
-    margin: -140px auto auto -180px;
-}   
 #Login1_LoginButton {
     color: #fff;
     background-color: #003680;
@@ -41,15 +30,13 @@
     width: 400px;
     height: 260px;
     margin-block: auto inherit;
-    margin: 0% -20% 50% 50%;
+    margin: -187px -20% 50% 50%;
 }
-
 #lbl_Ueberschrift {
     background-color: #003680;
     font-size: 2.55em;
     color: #fff;
 }
-
 .txt_design {
     color: #003680;
     font-size: 1.65em;
diff --git a/css/login/loginFLEX.css b/css/login/loginFLEX.css
index c679373..ddca493 100644
--- a/css/login/loginFLEX.css
+++ b/css/login/loginFLEX.css
@@ -35,7 +35,7 @@
         left: -20%;
         right: 520px;
         margin: 0 auto; 
-        margin-top:430px;
+        margin-top:370px;
     }
     #tbl_main {
         font-family: Arial;
diff --git a/login/Change_PW.aspx b/login/Change_PW.aspx
index d1f058a..945d278 100644
--- a/login/Change_PW.aspx
+++ b/login/Change_PW.aspx
@@ -101,7 +101,7 @@
                 .container-fluid {                    
                     width: 390px;                    
                     background-color: rgba(255,255,255,0.5);                   
-                    height: 613px;    
+                    height:423px;    
                     top:50%;
                     bottom: -4px;
                     left: -195px;
@@ -213,7 +213,7 @@
                 <table id="main_table" runat="server"  cellpadding="0" style="margin: 5% 2px 2px 2px; border:none;width:306px">
                     <tr style="color:#003680;height:55px;background-color:none">
                         <td>
-                            <asp:Label ID="lbl_Ueberschrift1" runat="server" Text="Password-Change" style="margin-left:75px;background-color:none;color:#043381" Font-Size="26px" Font-Bold="true" ></asp:Label>                           
+                            <asp:Label ID="lbl_Ueberschrift1" runat="server" Text="Password-Change" style="margin-left:45px;background-color:none;color:#043381" Font-Size="26px" Font-Bold="true" ></asp:Label>                           
                         </td>
                     </tr>
                     <tr style="border:2px solid #003680; margin:4px auto 4px auto;background-color:rgba(255,255,255,0.5)">
@@ -259,7 +259,8 @@
                          <tr style="color:#003680;height:56.67px;">
                             <td>
                                 <asp:TextBox id="txt_Pw_WH" CssClass="bg-key-icon" Width="250px" OnTextChanged="txt_Pw_WH_TextChanged" runat="server" TextMode="Password" Font-Names="Verdana" AutoCompleteType="Disabled" style="margin-left:30px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" OnClick="this.value='';" Placeholder="Repeat Password"></asp:TextBox>  
-                                <span></span>                                
+                                <span></span>        
+                                
                             </td>
                          </tr>    
                          <tr>
@@ -300,7 +301,7 @@
                                 <table>
                                     <tr>
                                         <td>
-                                            <asp:Image ID="Image1" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="17px" Width="15px" style="margin-left:280px"/>
+                                            <asp:Image ID="Image1" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="17px" Width="15px" style="margin-left:290px"/>
                                         </td>
                                      </tr>
                                      <tr>
@@ -348,7 +349,7 @@
                       </tr>
                         <tr style="color:#003680;height:26.67px;">
                             <td>    
-                                <asp:Button ID="btn_submitpw_M" runat="server" Text="Change password" OnClick="btn_submitpw_M_Click" Width="290px" style="margin-left:4%;margin-right:auto;border:none;height:40px;margin-top:1px"/>
+                                <asp:Button ID="btn_submitpw_M" runat="server" Text="Change password" OnClick="btn_submitpw_M_Click" Width="290px" style="margin-left:1%;margin-right:auto;border:none;height:40px;margin-top:1px"/>
                             </td>
                         </tr>
                               <tr style="color:#003680;height:20px;">
diff --git a/login/Change_PW.aspx.vb b/login/Change_PW.aspx.vb
index f0c0fac..557b5f3 100644
--- a/login/Change_PW.aspx.vb
+++ b/login/Change_PW.aspx.vb
@@ -121,19 +121,20 @@ Partial Class login_Change_PW
     Protected Sub btn_submitpw_Click(sender As Object, e As EventArgs)
         Dim tempstr As String = ""
         Dim Msg, Style, Title As String
+        reqPassw1txt_M.Enabled = False
+        reqPasswtxt_M.Enabled = False
+        reqPasswtxt.Enabled = True
+        reqPassw1txt.Enabled = True
+        reqPasswtxt.Validate()
+        If reqPasswtxt.IsValid = True Then
+            txt_Pw_WH.Enabled = True
+            reqPassw1txt.Validate()
+        End If
 
         If String.IsNullOrEmpty(txt_Pw.Text) = False AndAlso String.IsNullOrEmpty(txt_Pw_WH.Text) = False AndAlso String.IsNullOrEmpty(txt_Pw_M.Text) = True AndAlso String.IsNullOrEmpty(txt_Pw_WH_M.Text) = True Then
 
             txt_Pw_WH.Enabled = False
-            reqPassw1txt_M.Enabled = False
-            reqPasswtxt_M.Enabled = False
-            reqPasswtxt.Enabled = True
-            reqPassw1txt.Enabled = True
-            reqPasswtxt.Validate()
-            If reqPasswtxt.IsValid = True Then
-                txt_Pw_WH.Enabled = True
-                reqPassw1txt.Validate()
-            End If
+
 
             Dim ConnectionString = ""
 
@@ -182,17 +183,6 @@ Partial Class login_Change_PW
 
         If String.Equals(txt_Pw.Text, tempstr) = True AndAlso String.Equals(txt_Pw_WH.Text, tempstr) = True AndAlso String.IsNullOrEmpty(txt_Pw_M.Text) = True And String.IsNullOrEmpty(txt_Pw_WH_M.Text) = True And String.Equals(tempstr, "Error01") = False And tempstr = "Error02" Then
 
-
-            txt_Pw_WH_M.Enabled = False
-            reqPasswtxt.Enabled = False
-            reqPassw1txt.Enabled = False
-            reqPassw1txt.Enabled = True
-            reqPasswtxt.Enabled = True
-            reqPasswtxt.Validate()
-            If reqPasswtxt.IsValid = True Then
-                txt_Pw_WH.Enabled = True
-                regexval_txt_Pw.Validate()
-            End If
             If regexval_txt_Pw.IsValid = True Then
                 Try
                     Dim ConnectionString = ""
@@ -310,13 +300,19 @@ Partial Class login_Change_PW
     Protected Sub btn_submitpw_M_Click(sender As Object, e As EventArgs)
         Dim tempstr As String = ""
         Dim ConnectionString = ""
-        If String.IsNullOrEmpty(txt_Pw_M.Text) = False AndAlso String.IsNullOrEmpty(txt_Pw_WH_M.Text) = False AndAlso String.IsNullOrEmpty(txt_Pw.Text) = True AndAlso String.IsNullOrEmpty(txt_Pw_WH.Text) = True Then
-            reqPasswtxt.Enabled = False
-            reqPasswtxt.Enabled = False
-            reqPasswtxt_M.Enabled = True
-            reqPassw1txt_M.Enabled = True
-            reqPasswtxt_M.Validate()
+        confirmPasswordReq.Enabled = False
+        confirmPasswordReq_M.Enabled = True
+        confirmPasswordReq_M.Validate()
+        reqPasswtxt.Enabled = False
+        reqPasswtxt.Enabled = False
+        reqPasswtxt_M.Enabled = True
+        reqPassw1txt_M.Enabled = True
+        reqPasswtxt_M.Validate()
+        If reqPasswtxt_M.IsValid Then
             reqPassw1txt_M.Validate()
+        End If
+        If String.IsNullOrEmpty(txt_Pw_M.Text) = False AndAlso String.IsNullOrEmpty(txt_Pw_WH_M.Text) = False AndAlso String.IsNullOrEmpty(txt_Pw.Text) = True AndAlso String.IsNullOrEmpty(txt_Pw_WH.Text) = True Then
+
 
             If reqPasswtxt_M.IsValid = True AndAlso reqPassw1txt_M.IsValid = True Then
                 If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 4c76f13..cb18d75 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -55,16 +55,16 @@
     color: #003680;
     font-size: 1.725em;
         }
-         .container-fluid {
+        .container-fluid {
         width: 400px;
         height: 473px;
         position:absolute;
         background-color: rgba(255,255,255,0.5);
-        top:50%;
+        top:44%;
         bottom: 50%;
         left: 50%;
         right: 50%;
-        margin: -140px auto auto -180px;
+        margin: -148px auto auto -180px;
     }   
     @media (max-width: 558.98px) {
     body {
@@ -87,14 +87,14 @@
         width: 390px;
         height: 613px;
         margin: 0 auto;
-        margin-top: 25%;
+        margin-top: 0px;
         margin-left: 5%;
     }
     .container-fluid {
         width: 395px;
         height: 613px;
         background-color: rgba(255,255,255,0.5);
-        top:50%;
+        top:0%;
         bottom: auto;
         left: -2px;
         right: 2020px;
@@ -298,10 +298,10 @@
             <center>
                    <!-- Große Bildschirme-->   
             <div class="d-none d-md-block">
-            <table id="tbl_main" cellpadding="0" style="border:none; margin-left:-20px">
+            <table id="tbl_main" cellpadding="0" style="border:none; margin-left:-45px;margin-top:2%">
                 <tr style="color:#003680;height:28px;">
                                    <td>
-                                       <asp:Button ID="btn_Back" runat="server" Width="265" CausesValidation="false" Text="Back" OnClick="btn_Back_Click" style="margin-left:49px;height:31px;font-weight:300;font-size:20px"/>
+                                       <asp:LinkButton ID="btn_Back" runat="server" Width="265" CssClass="btn btn-primary" CausesValidation="false" OnClick="btn_Back_Click" style="margin-left:49px;font-weight:300;font-size:20px" Height="40px"><center><label for="btn_Back" style="margin:0px 2px 2px auto" runat="server"><center>Back</center></label></center></asp:LinkButton>
                                    </td>
                                </tr>
                  <tr style="color:#003680; height:42px;font-size:14px">
@@ -330,8 +330,8 @@
                     <asp:TextBox ID="txt_Username" runat="server" CssClass="bg-user-icon" ValidationGroup="val-desk" Placeholder="Username" Font-Size="1.125em" Width="265" style="margin-left:45px;color:#003680;margin-bottom:-6px;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" />
                     <asp:RequiredFieldValidator ID="valreqtxtusername" SetFocusOnError="true" ControlToValidate="txt_Username" ValidationGroup="val-desk" runat="server" ForeColor="Red" Text="" ErrorMessage="*"></asp:RequiredFieldValidator>                           
                      </td></tr>                              
-                <tr style="color:#003680; height:49px;"><td>    
-                     <asp:LinkButton ID="btn_Send" runat="server" CssClass="btn btn-primary" Width="265px" Enabled="true" AutoPostBack="True" Font-Size="22px" style="margin-left:49px;border:none" OnClick="btn_Send_Click" Height="40px"><center><label for="btn_Send" style="color:#fff;margin:0 2px 2px auto;font-size:21px"><center>Send</center></label></center></asp:LinkButton> 
+                <tr style="color:#003680; height:52px;"><td>    
+                     <asp:LinkButton ID="btn_Send" runat="server" CssClass="btn btn-primary" Width="265px" Enabled="true" AutoPostBack="True" Font-Size="22px" style="margin-left:47px;margin-top:15px;border:none" OnClick="btn_Send_Click" Height="40px"><center><label for="btn_Send" style="color:#fff;margin:0 2px 2px auto;font-size:21px"><center>Send</center></label></center></asp:LinkButton> 
                                     </td></tr> 
                 <tr style="color:#003680; height:38px;">
                 <td align="right" colspan="2">                    
@@ -351,7 +351,7 @@
                 </div>
                  <!--Smartphone-Bildschirme-->   
                       <div class="d-md-none"> 
-                          <table id="tbl_main_M" cellpadding="0" style="margin:0% 50% 50% 4px; border: none;">
+                          <table id="tbl_main_M" cellpadding="0" style="margin:0px 50% 50% 4px; border: none;">
                 <tr style="color:#003680;height:65px;margin-top:-70px">
                                    <td>
                                        <asp:Button ID="btn_Back_M" runat="server" Text="Back" OnClick="btn_Back_Click" Height="37px"/>
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index 2e9f461..499f905 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -232,7 +232,6 @@
         margin-left:8px;
         color:#003680;        
     }   
-
 }
     </style>
  <!-- <script type="text/javascript" src="../js/toptions/top_up-min.js"></script> -->