diff --git a/BeWo/View/PasswortAenderungsView.xaml.cs b/BeWo/View/PasswortAenderungsView.xaml.cs
index ded3194f2..40e155da7 100644
--- a/BeWo/View/PasswortAenderungsView.xaml.cs
+++ b/BeWo/View/PasswortAenderungsView.xaml.cs
@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
-using BeWo.Core;
 using BeWo.PasswortSecurity;
 using BeWo.ServiceProxy;
 using BeWo.ViewModel;
diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
index d2323abb6..f200008f4 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
@@ -4659,6 +4659,7 @@
     <Content Include="Scripts\utils\js-helper.js" />
     <Content Include="Scripts\utils\list-utils.js" />
     <Content Include="Scripts\utils\logging.js" />
+    <Content Include="Scripts\utils\password-security.js" />
     <Content Include="Scripts\utils\resources-list-utils.js" />
     <Content Include="Scripts\utils\service-record-time-calc.js" />
     <Content Include="Scripts\utils\trimCanvas.js" />
@@ -5092,7 +5093,7 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>False</UseIIS>
+          <UseIIS>True</UseIIS>
           <AutoAssignPort>False</AutoAssignPort>
           <DevelopmentServerPort>8808</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs
index 619854cdb..44094efe1 100644
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
@@ -3801,6 +3801,8 @@ namespace BeWoPlanerMobil.Controllers
             // ToDo: Testen! falsches oldPassword, kein oldPassword, newPassword stimmt nicht mit confirmationPassword überein, kein confirmationPassword, kein newPassword
             UserService.ChangePassword(userName, userVersion, oldPassword, newPassword);
 
+            // ToDo: Regeln beachten, welche Passwortstärke mindestens erreicht werden muss.
+
             return RedirectToActionPermanent("Main");
         }
     }
diff --git a/BeWoPlanerMobil/Views/Main/Main.cshtml b/BeWoPlanerMobil/Views/Main/Main.cshtml
index 10ca812ac..06c2d7e20 100644
--- a/BeWoPlanerMobil/Views/Main/Main.cshtml
+++ b/BeWoPlanerMobil/Views/Main/Main.cshtml
@@ -16,118 +16,11 @@
 }
 
 <script>
-    // ToDo: Aus test.html übernehmen. Ist nicht korrekt!
+    var passwordSercurity = new PasswordSecurity("pw-strength-feedback");
+
     function validatePasswordStrength() {
         try {
-            var pw = $("#new-password").val();
-            var length = pw === undefined || pw === null ? 0 : pw.length;
-
-            var fb = $("#pw-strength-feedback");
-            fb.removeClass("text-danger text-warning text-success");
-            if (isEmptyOrSpaces(pw)) {
-                fb.hide();
-            }
-
-            var pwAsArray = Array.from(pw);
-
-            var numbers = "0123456789";
-            var lowercaseLetters = "abcdefghijklmnopqrstuvwxyz";
-            var uppercaseLetters = "ABDEFGHIJKLMNOPQRSTUVWXYZ";
-            var lowercaseUmlauts = "äöüß";
-            var uppercaseUmlauts = "ÄÖÜ";
-            var specialCharacters = "\\\"\'µ@@€!&/()=?+#*,.-;:_><|§$%'{[]}´`^°~²³";
-
-            var numberCount = 0;
-            var lowercaseLetterCount = 0;
-            var uppercaseLetterCount = 0;
-            var lowercaseUmlautCount = 0;
-            var uppercaseUmlautCount = 0;
-            var specialCharacterCount = 0;
-
-            pwAsArray.map(c => { if(numbers.includes(c)) { numberCount++; } });
-            pwAsArray.map(c => { if(lowercaseLetters.includes(c)) { lowercaseLetterCount++; } });
-            pwAsArray.map(c => { if(uppercaseLetters.includes(c)) { uppercaseLetterCount++; } });
-            pwAsArray.map(c => { if(lowercaseUmlauts.includes(c)) { lowercaseUmlautCount++; } });
-            pwAsArray.map(c => { if(uppercaseUmlauts.includes(c)) { uppercaseUmlautCount++; } });
-            pwAsArray.map(c => { if (specialCharacters.includes(c)) { specialCharacterCount++; } });
-
-            var score = -1;
-            if(length < 6) {
-                score = -1;
-            } else if (length > 5 && length < 9) {
-                score += 1;
-                logInfo("score + 1 = " + score);
-            } else if (length < 9) {
-                score += 2;
-                logInfo("score + 2 = " + score);
-            } else if (length < 9) {
-                score += 3;
-                logInfo("score + 3 = " + score);
-            } else {
-                score += 4;
-                logInfo("score + 4 = " + score);
-            }
-
-            score += numberCount * 3;
-            logInfo2("score + " + (numberCount * 3) + " = " + score);
-            score += lowercaseLetterCount * 2;
-            logInfo2("score + " + (lowercaseLetterCount * 3) + " = " + score);
-            score += uppercaseLetterCount * 3;
-            logInfo2("score + " + (uppercaseLetterCount * 3) + " = " + score);
-            score += lowercaseUmlautCount * 2;
-            logInfo2("score + " + (lowercaseUmlautCount * 3) + " = " + score);
-            score += uppercaseUmlautCount * 2;
-            logInfo2("score + " + (uppercaseUmlautCount * 3) + " = " + score);
-            score += specialCharacterCount * 4;
-            logInfo2("score + " + (specialCharacterCount * 3) + " = " + score);
-
-            var strength = 0;
-
-            if (score < 16) {
-                strength = 0;
-            } else if(score < 56) {
-                strength = 1;
-            } else if(score < 116) {
-                strength = 2;
-            } else if(score < 156) {
-                strength = 3;
-            } else {
-                strength = 4;
-            }
-
-            var strengthText = "Passwortstärke: ";
-            var colorClass = "";
-
-            switch(strength) {
-            case 0:
-                strengthText += "sehr schwach";
-                colorClass = "text-danger";
-                break;
-            case 1:
-                strengthText += "schwach";
-                colorClass = "text-danger";
-                break;
-            case 2:
-                strengthText += "mittel";
-                colorClass = "text-warning";
-                break;
-            case 3:
-                strengthText += "stark";
-                colorClass = "text-success";
-                break;
-            case 4:
-                strengthText += "sehr stark";
-                colorClass = "text-success";
-                break;
-            }
-
-            logInfo3("Password score: " + score);
-
-            if (!isEmptyOrSpaces(colorClass)) {
-                fb.addClass(colorClass);
-                fb.html(strengthText);
-                fb.show();
-            }
+            passwordSercurity.validatePassword($("#new-password").val());
         } catch (error) {
             showErrorPopup(error);
         }
@@ -947,7 +840,7 @@
                                 <div class="input-group-prepend">
                                     <div class="input-group-text pw-prepend">Neues Passwort</div>
                                 </div>
-                                <input type="password" class="form-control" name="new-password" id="new-password" onchange="validatePasswordStrength()" required />
+                                <input type="password" class="form-control" name="new-password" id="new-password" onkeyup="validatePasswordStrength()" required />
                             </div>
                         </div>
                     </div>
@@ -957,7 +850,7 @@
                                 <div class="input-group-prepend">
                                     <span class="input-group-text pw-prepend">Passwort bestätigen</span>
                                 </div>
-                                <input type="password" class="form-control" name="confirm-new-password" id="confirm-new-password" onchange="validatePasswordStrength()" required />
+                                <input type="password" class="form-control" name="confirm-new-password" id="confirm-new-password" required />
                             </div>
                         </div>
                     </div>
diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
index e406213e3..2073e3279 100644
--- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
+++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
@@ -70,6 +70,7 @@
     <script src="@Url.Content("~/Scripts/utils/service-record-time-calc.js")" type="text/javascript"></script>
     <script src="@Url.Content("~/Scripts/utils/js-helper.js")" type="text/javascript"></script>
     <script src="@Url.Content("~/Scripts/utils/logging.js")" type="text/javascript"></script>
+    <script src="@Url.Content("~/Scripts/utils/password-security.js")"></script>
 
     <script>
         window.addEventListener("error", (event) => {
diff --git a/ReportImp/Monvita/ServicesOverviewReport.Designer.cs b/ReportImp/Monvita/ServicesOverviewReport.Designer.cs
index e59348c13..3eae8fda7 100644
--- a/ReportImp/Monvita/ServicesOverviewReport.Designer.cs
+++ b/ReportImp/Monvita/ServicesOverviewReport.Designer.cs
@@ -53,12 +53,11 @@ namespace Monvita
             this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
             this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox();
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
             this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
@@ -69,6 +68,9 @@ namespace Monvita
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField();
+            this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -330,6 +332,8 @@ namespace Monvita
             // GroupFooter1
             // 
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPictureBox1,
+            this.xrLabel17,
             this.xrLabel3,
             this.xrLabel5,
             this.xrLabel6,
@@ -338,6 +342,20 @@ namespace Monvita
             this.GroupFooter1.HeightF = 177.2917F;
             this.GroupFooter1.Name = "GroupFooter1";
             // 
+            // xrLabel3
+            // 
+            this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Top;
+            this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 152.2917F);
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(333F, 25F);
+            this.xrLabel3.StylePriority.UseBorders = false;
+            this.xrLabel3.StylePriority.UseFont = false;
+            this.xrLabel3.StylePriority.UseTextAlignment = false;
+            this.xrLabel3.Text = "Ort, Datum\tUnterschrift Bezugsbetreuer/in";
+            this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
             // xrLabel5
             // 
             this.xrLabel5.Font = new System.Drawing.Font("Arial", 10F);
@@ -392,24 +410,6 @@ namespace Monvita
             this.xrLabel2.StylePriority.UseTextAlignment = false;
             this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
-            // 
-            // xrLabel3
-            // 
-            this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F);
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 152.2917F);
-            this.xrLabel3.Name = "xrLabel3";
-            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel3.SizeF = new System.Drawing.SizeF(333F, 25F);
-            this.xrLabel3.StylePriority.UseBorders = false;
-            this.xrLabel3.StylePriority.UseFont = false;
-            this.xrLabel3.StylePriority.UseTextAlignment = false;
-            this.xrLabel3.Text = "Ort, Datum\tUnterschrift Bezugsbetreuer/in";
-            this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            // 
             // formattingRuleStartDate
             // 
             this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
@@ -489,6 +489,35 @@ namespace Monvita
             this.fieldGruppe.FieldType = DevExpress.XtraReports.UI.FieldType.String;
             this.fieldGruppe.Name = "fieldGruppe";
             // 
+            // xrLabel17
+            // 
+            this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")});
+            this.xrLabel17.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(59.99999F, 116.7917F);
+            this.xrLabel17.Name = "xrLabel17";
+            this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel17.SizeF = new System.Drawing.SizeF(95.16222F, 35.50002F);
+            this.xrLabel17.StylePriority.UseBackColor = false;
+            this.xrLabel17.StylePriority.UseFont = false;
+            this.xrLabel17.StylePriority.UseTextAlignment = false;
+            this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            // 
+            // xrPictureBox1
+            // 
+            this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")});
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(155.1622F, 116.7917F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(177.8378F, 35.50002F);
+            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
             // Stundenzettel
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -558,5 +587,7 @@ namespace Monvita
         private DevExpress.XtraReports.UI.XRPictureBox picSignature;
         private DevExpress.XtraReports.UI.XRLabel xrLabel5;
         private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel17;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
     }
 }
diff --git a/ReportImp/Monvita/ServicesOverviewReportAlt.Designer.cs b/ReportImp/Monvita/ServicesOverviewReportAlt.Designer.cs
index 3d8530f7d..aaf0dbfe0 100644
--- a/ReportImp/Monvita/ServicesOverviewReportAlt.Designer.cs
+++ b/ReportImp/Monvita/ServicesOverviewReportAlt.Designer.cs
@@ -47,6 +47,7 @@ namespace Monvita.Alt
             this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -54,6 +55,7 @@ namespace Monvita.Alt
             this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
@@ -65,9 +67,11 @@ namespace Monvita.Alt
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
             this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
-            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
             this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -267,6 +271,18 @@ namespace Monvita.Alt
             this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             this.xrTableCell14.Weight = 0.075757575408792063D;
             // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldGruppe")});
+            this.xrTableCell6.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.StylePriority.UseFont = false;
+            this.xrTableCell6.StylePriority.UseTextAlignment = false;
+            this.xrTableCell6.Text = "xrTableCell6";
+            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell6.Weight = 0.088383838716013352D;
+            // 
             // xrTableCell15
             // 
             this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -304,6 +320,10 @@ namespace Monvita.Alt
             // GroupFooter1
             // 
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPictureBox1,
+            this.xrLabel17,
+            this.xrPictureBox2,
+            this.xrLabel18,
             this.xrLabel3,
             this.xrLabel2,
             this.xrLabel4});
@@ -351,13 +371,14 @@ namespace Monvita.Alt
             this.xrLabel4.Text = "Ich versichere die Richtigkeit der o.g. Angaben:";
             this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
             // formattingRuleStartDate
             // 
             this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
             this.formattingRuleStartDate.DataMember = "ServicesDouble";
-            // 
-            // 
-            // 
             this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.formattingRuleStartDate.Name = "formattingRuleStartDate";
             // 
@@ -399,9 +420,6 @@ namespace Monvita.Alt
             // 
             this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
             this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
-            // 
-            // 
-            // 
             this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
             // 
@@ -409,9 +427,6 @@ namespace Monvita.Alt
             // 
             this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
             this.formattingRuleCostBearer.DataMember = "ServicesDouble";
-            // 
-            // 
-            // 
             this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
             // 
@@ -419,9 +434,6 @@ namespace Monvita.Alt
             // 
             this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
             this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
-            // 
-            // 
-            // 
             this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
             // 
@@ -455,18 +467,6 @@ namespace Monvita.Alt
             this.GroupFooter2.HeightF = 46.35416F;
             this.GroupFooter2.Name = "GroupFooter2";
             // 
-            // xrTableCell6
-            // 
-            this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldGruppe")});
-            this.xrTableCell6.Font = new System.Drawing.Font("Arial", 10F);
-            this.xrTableCell6.Name = "xrTableCell6";
-            this.xrTableCell6.StylePriority.UseFont = false;
-            this.xrTableCell6.StylePriority.UseTextAlignment = false;
-            this.xrTableCell6.Text = "xrTableCell6";
-            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrTableCell6.Weight = 0.088383838716013352D;
-            // 
             // fieldGruppe
             // 
             this.fieldGruppe.DataMember = "Services";
@@ -474,9 +474,52 @@ namespace Monvita.Alt
             this.fieldGruppe.FieldType = DevExpress.XtraReports.UI.FieldType.String;
             this.fieldGruppe.Name = "fieldGruppe";
             // 
-            // bindingSource1
+            // xrLabel18
             // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")});
+            this.xrLabel18.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(421.5F, 74.29167F);
+            this.xrLabel18.Name = "xrLabel18";
+            this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel18.SizeF = new System.Drawing.SizeF(95F, 35.50002F);
+            this.xrLabel18.StylePriority.UseFont = false;
+            this.xrLabel18.StylePriority.UseTextAlignment = false;
+            this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            // 
+            // xrPictureBox2
+            // 
+            this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Image", null, "CustomerSignature")});
+            this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(516.4999F, 74.29167F);
+            this.xrPictureBox2.Name = "xrPictureBox2";
+            this.xrPictureBox2.SizeF = new System.Drawing.SizeF(163.5001F, 35.50002F);
+            this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
+            // xrLabel17
+            // 
+            this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")});
+            this.xrLabel17.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(59.99999F, 74.29167F);
+            this.xrLabel17.Name = "xrLabel17";
+            this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel17.SizeF = new System.Drawing.SizeF(95F, 35.50002F);
+            this.xrLabel17.StylePriority.UseBackColor = false;
+            this.xrLabel17.StylePriority.UseFont = false;
+            this.xrLabel17.StylePriority.UseTextAlignment = false;
+            this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            // 
+            // xrPictureBox1
+            // 
+            this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")});
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(155F, 74.29167F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(178F, 35.50002F);
+            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
             // 
             // Stundenzettel
             // 
@@ -499,7 +542,7 @@ namespace Monvita.Alt
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
-            this.Version = "13.2";
+            this.Version = "17.1";
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -547,5 +590,9 @@ namespace Monvita.Alt
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
         private DevExpress.XtraReports.UI.CalculatedField fieldGruppe;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel18;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel17;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
     }
 }
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index 1349d73f4..7193bd8f4 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -40,7 +40,7 @@ namespace BeWo.Service.Plugins
                 //t = "1378137009"; // BeWo Direkt+
                 //t = "3010479871"; // Aachener Verein
                 //t = "3849764093"; // Club 74
-                t = "5805202339"; // Wegweiser Betreuungsdienst
+                //t = "5805202339"; // Wegweiser Betreuungsdienst
                 //t = "2301474784"; // Hauskrankenpflege Leiendecker
                 //t = "8243565510"; // Der Karren
                 //t = "7709306800"; // Der Karren SBD
@@ -117,7 +117,7 @@ namespace BeWo.Service.Plugins
                 //t = "4271389563"; // Komm Mit
                 //t = "5430005891"; // Marienhospital Eickel
                 //t = "3265049248"; // Gerdas Pflegedienst
-                t = "1549622397"; // Kontakt und Krisenhilfe
+                //t = "1549622397"; // Kontakt und Krisenhilfe
                 //t = "4782194565"; // Skm Rheydt
                 //t = "7535795843"; // Sozialwerk Dürener Christen
                 //t = "6388340414"; // Weitblick
@@ -146,7 +146,7 @@ namespace BeWo.Service.Plugins
                 //t = "4595275645"; // Eigenständig
                 //t = "7912635399"; // Prof. Dr. Eggers Stiftung
                 //t = "3549726254"; // Socia
-                //t = "1992495802"; // Monvita
+                t = "1992495802"; // Monvita
                 //t = "7381352241"; // Ressource e.V.
                 //t = "3607551608"; // Betreuungsbüro Scholz
                 //t = "3104936392"; // B.A.P. Bielefelder Ambulante Pflege
@@ -333,7 +333,7 @@ namespace BeWo.Service.Plugins
                 //t = "7748694330"; // Caritasverband der Diözese Rottenburg-Stuttgart e.V. als Rechtsträger der Caritas Ludwigsburg-Waiblingen-Enz (Projekt heißt CaritasLudwigsburgWaiblingenEnz)
                 //t = "5578206856"; // SHK Service GmbH
                 //t = "1508800817"; // Behindert na und e.V.
-                t = "4351087063"; // MOBILE e.V. - Selbstbestimmtes Leben
+                //t = "4351087063"; // MOBILE e.V. - Selbstbestimmtes Leben
                 //t = "1262219859"; // Psychosoziale Projekte Saarpfalz
                 //t = "2986016022"; // Ev Verein für Wohnraumhilfe Frankfurt a.M.
                 //t = "2181497347"; // BetreuungsserviceFuerAlltagUndWohnen (BAW Aachen)
diff --git a/Service/ServiceImplementations/UserServiceImp.cs b/Service/ServiceImplementations/UserServiceImp.cs
index 07cabea25..b0124e8f4 100644
--- a/Service/ServiceImplementations/UserServiceImp.cs
+++ b/Service/ServiceImplementations/UserServiceImp.cs
@@ -33,12 +33,11 @@ namespace BeWo.Service.ServiceImplementations
     {
         public long ChangePassword(string pUserName, long pUserVersion, string pOldPassword, string pNewPassword)
         {
-            bool allowChange = false;
+            var allowChange = false;
 
-            if (LoggedInUserOperationContextExt.Current != null)
+            var user = LoggedInUserOperationContextExt.Current?.User ?? SessionFacade.LoggedInUser;
+            if (user != null)
             {
-                var user = LoggedInUserOperationContextExt.Current.User;
-
                 if (user.CheckForRight(UserRightType.UserView_AllowChangePassword))
                 {
                     allowChange = true;
@@ -47,7 +46,6 @@ namespace BeWo.Service.ServiceImplementations
                 {
                     allowChange = true;
                 }
-                    
             }
 
             if (allowChange)
@@ -105,7 +103,7 @@ namespace BeWo.Service.ServiceImplementations
                 return lOriginal.Version.Value;
             }
 
-            throw new FaultException<BeWoFault>(new BeWoFault("Sie besitzen nicht die erforderlichen Rechte um das Passwort zu ändern!", BeWoFaultType.CustomWithoutDetails));
+            throw new FaultException<BeWoFault>(new BeWoFault("Sie besitzen nicht die erforderlichen Rechte, um das Passwort zu ändern!", BeWoFaultType.CustomWithoutDetails));
         }
 
         public void CreateNewUser(string pUserName, string pPassword, string pEmail)