diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs
index 535fbdac7..09c81e8ca 100644
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
@@ -1362,6 +1362,7 @@ namespace BeWoPlanerMobil.Controllers
             if(Model is null)
             {
                 TempData[TempDataConstants.DoLogoutKey] = true;
+                return Logout();
             }
 
             var dc = Model.SelectedServiceRecord;
@@ -2047,6 +2048,10 @@ namespace BeWoPlanerMobil.Controllers
                 return LeerzeichenFuerGetMethoden;
             }
 
+            var serviceDescription = OperationsService.GetServiceDescription(pServiceDescriptionOid);
+
+            Model.SelectedServiceDescription = serviceDescription;
+
             Model.SelectedServiceDescriptionOid = pServiceDescriptionOid;
             return LeerzeichenFuerGetMethoden;
         }
diff --git a/BeWoPlanerMobil/Models/MainModel.cs b/BeWoPlanerMobil/Models/MainModel.cs
index 2cfc40c20..07bb18a24 100644
--- a/BeWoPlanerMobil/Models/MainModel.cs
+++ b/BeWoPlanerMobil/Models/MainModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Diagnostics;
 using System.Linq;
 using System.Web.Mvc;
 using BeWo.View.Navigation.Filter;
@@ -774,6 +775,9 @@ namespace BeWoPlanerMobil.Models
         public Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>> Categories2Descriptions { get; set; }
 
         public ServiceCategoryDC SelectedServiceCategory { get; set; }
+
+        private ServiceDescriptionDC _SelectedServiceDescription;
+
         public ServiceDescriptionDC SelectedServiceDescription { get; set; }
 
         public ServiceDescriptionDC GetSelectedOrFirstServiceDescription()
diff --git a/BeWoPlanerMobil/Views/Main/Main.cshtml b/BeWoPlanerMobil/Views/Main/Main.cshtml
index be91cac9d..abd390151 100644
--- a/BeWoPlanerMobil/Views/Main/Main.cshtml
+++ b/BeWoPlanerMobil/Views/Main/Main.cshtml
@@ -798,7 +798,6 @@
 </div>
 
 @* ----- Bewertungspopup für Ziele ----- *@
-@* ToDo: In PartialView verschieben und dann bei Gruppenbuchungen neuladen, wenn Hilfepläne entfernt oder hinzugefügt werden *@
 @if(AbstractModel.HasRightToRateGoals)
 {
     <div id="goal-rating-popup" class="modal" tabindex="-1" role="dialog" style="z-index: 9999 !important">