diff --git a/FSSiegen.Diagram1.view b/FSSiegen.Diagram1.view
index d5a3577..1be194a 100644
--- a/FSSiegen.Diagram1.view
+++ b/FSSiegen.Diagram1.view
@@ -172,26 +172,45 @@
                       <TypeName>EntityDeveloper.EntityFrameworkCore.EntityProperty</TypeName>
                     </Oid>
                   </Model>
+                  <Model xsi:type="PropertyVwModel">
+                    <CustomProperties>
+                      <OID>11</OID>
+                      <Parent>2</Parent>
+                    </CustomProperties>
+                    <Children />
+                    <Location>
+                      <X>0.5 px</X>
+                      <Y>144.5 px</Y>
+                    </Location>
+                    <Size>
+                      <Width>162 px</Width>
+                      <Height>18 px</Height>
+                    </Size>
+                    <Oid xsi:type="SchemaModelOID">
+                      <Path>bfc9e3b2-f7cb-4b9b-a3e9-68f84d16bcae</Path>
+                      <TypeName>EntityDeveloper.EntityFrameworkCore.EntityProperty</TypeName>
+                    </Oid>
+                  </Model>
                 </Children>
                 <Size>
                   <Width>163 px</Width>
-                  <Height>145 px</Height>
+                  <Height>163 px</Height>
                 </Size>
                 <MaxSize>
                   <Width>0 px</Width>
-                  <Height>145 px</Height>
+                  <Height>163 px</Height>
                 </MaxSize>
               </Model>
               <Model xsi:type="RelationPropertiesVwModel">
                 <CustomProperties>
-                  <OID>11</OID>
+                  <OID>12</OID>
                   <Parent>1</Parent>
                 </CustomProperties>
                 <Children>
                   <Model xsi:type="RelationPropertyVwModel">
                     <CustomProperties>
-                      <OID>12</OID>
-                      <Parent>11</Parent>
+                      <OID>13</OID>
+                      <Parent>12</Parent>
                     </CustomProperties>
                     <Children />
                     <Size>
@@ -206,7 +225,7 @@
                 </Children>
                 <Location>
                   <X>0 px</X>
-                  <Y>144 px</Y>
+                  <Y>162 px</Y>
                 </Location>
                 <Size>
                   <Width>163 px</Width>
@@ -225,15 +244,15 @@
             </Location>
             <Size>
               <Width>168 px</Width>
-              <Height>230 px</Height>
+              <Height>248 px</Height>
             </Size>
             <MinSize>
               <Width>100 px</Width>
-              <Height>230 px</Height>
+              <Height>248 px</Height>
             </MinSize>
             <MaxSize>
               <Width>800 px</Width>
-              <Height>230 px</Height>
+              <Height>248 px</Height>
             </MaxSize>
             <Ports />
             <Oid xsi:type="SchemaModelOID">
@@ -244,20 +263,20 @@
           </Model>
           <Model xsi:type="EnumTypeVwModel">
             <CustomProperties>
-              <OID>13</OID>
+              <OID>14</OID>
               <Parent>0</Parent>
             </CustomProperties>
             <Children>
               <Model xsi:type="PropertiesVwModel">
                 <CustomProperties>
-                  <OID>14</OID>
-                  <Parent>13</Parent>
+                  <OID>15</OID>
+                  <Parent>14</Parent>
                 </CustomProperties>
                 <Children>
                   <Model xsi:type="EnumTypeMemberVwModel">
                     <CustomProperties>
-                      <OID>15</OID>
-                      <Parent>14</Parent>
+                      <OID>16</OID>
+                      <Parent>15</Parent>
                     </CustomProperties>
                     <Children />
                     <Location>
@@ -275,8 +294,8 @@
                   </Model>
                   <Model xsi:type="EnumTypeMemberVwModel">
                     <CustomProperties>
-                      <OID>16</OID>
-                      <Parent>14</Parent>
+                      <OID>17</OID>
+                      <Parent>15</Parent>
                     </CustomProperties>
                     <Children />
                     <Location>
@@ -294,8 +313,8 @@
                   </Model>
                   <Model xsi:type="EnumTypeMemberVwModel">
                     <CustomProperties>
-                      <OID>17</OID>
-                      <Parent>14</Parent>
+                      <OID>18</OID>
+                      <Parent>15</Parent>
                     </CustomProperties>
                     <Children />
                     <Location>
@@ -313,8 +332,8 @@
                   </Model>
                   <Model xsi:type="EnumTypeMemberVwModel">
                     <CustomProperties>
-                      <OID>18</OID>
-                      <Parent>14</Parent>
+                      <OID>19</OID>
+                      <Parent>15</Parent>
                     </CustomProperties>
                     <Children />
                     <Location>
@@ -366,20 +385,20 @@
           </Model>
           <Model xsi:type="ClassVwModel">
             <CustomProperties>
-              <OID>19</OID>
+              <OID>20</OID>
               <Parent>0</Parent>
             </CustomProperties>
             <Children>
               <Model xsi:type="PropertiesVwModel">
                 <CustomProperties>
-                  <OID>20</OID>
-                  <Parent>19</Parent>
+                  <OID>21</OID>
+                  <Parent>20</Parent>
                 </CustomProperties>
                 <Children>
                   <Model xsi:type="PropertyVwModel">
                     <CustomProperties>
-                      <OID>21</OID>
-                      <Parent>20</Parent>
+                      <OID>22</OID>
+                      <Parent>21</Parent>
                     </CustomProperties>
                     <Children />
                     <Location>
@@ -397,8 +416,8 @@
                   </Model>
                   <Model xsi:type="PropertyVwModel">
                     <CustomProperties>
-                      <OID>22</OID>
-                      <Parent>20</Parent>
+                      <OID>23</OID>
+                      <Parent>21</Parent>
                     </CustomProperties>
                     <Children />
                     <Location>
@@ -416,8 +435,8 @@
                   </Model>
                   <Model xsi:type="PropertyVwModel">
                     <CustomProperties>
-                      <OID>23</OID>
-                      <Parent>20</Parent>
+                      <OID>24</OID>
+                      <Parent>21</Parent>
                     </CustomProperties>
                     <Children />
                     <Location>
@@ -435,8 +454,8 @@
                   </Model>
                   <Model xsi:type="PropertyVwModel">
                     <CustomProperties>
-                      <OID>24</OID>
-                      <Parent>20</Parent>
+                      <OID>25</OID>
+                      <Parent>21</Parent>
                     </CustomProperties>
                     <Children />
                     <Location>
@@ -447,25 +466,6 @@
                       <Width>144 px</Width>
                       <Height>18 px</Height>
                     </Size>
-                    <Oid xsi:type="SchemaModelOID">
-                      <Path>db78282f-9001-4e54-a175-fe4391e714fc</Path>
-                      <TypeName>EntityDeveloper.EntityFrameworkCore.EntityProperty</TypeName>
-                    </Oid>
-                  </Model>
-                  <Model xsi:type="PropertyVwModel">
-                    <CustomProperties>
-                      <OID>25</OID>
-                      <Parent>20</Parent>
-                    </CustomProperties>
-                    <Children />
-                    <Location>
-                      <X>0.5 px</X>
-                      <Y>72.5 px</Y>
-                    </Location>
-                    <Size>
-                      <Width>144 px</Width>
-                      <Height>18 px</Height>
-                    </Size>
                     <Oid xsi:type="SchemaModelOID">
                       <Path>12d616f2-eee0-4dbc-9a24-fecb7e65e9ba</Path>
                       <TypeName>EntityDeveloper.EntityFrameworkCore.EntityProperty</TypeName>
@@ -474,12 +474,12 @@
                   <Model xsi:type="PropertyVwModel">
                     <CustomProperties>
                       <OID>26</OID>
-                      <Parent>20</Parent>
+                      <Parent>21</Parent>
                     </CustomProperties>
                     <Children />
                     <Location>
                       <X>0.5 px</X>
-                      <Y>90.5 px</Y>
+                      <Y>72.5 px</Y>
                     </Location>
                     <Size>
                       <Width>144 px</Width>
@@ -493,17 +493,17 @@
                 </Children>
                 <Size>
                   <Width>145 px</Width>
-                  <Height>109 px</Height>
+                  <Height>91 px</Height>
                 </Size>
                 <MaxSize>
                   <Width>0 px</Width>
-                  <Height>109 px</Height>
+                  <Height>91 px</Height>
                 </MaxSize>
               </Model>
               <Model xsi:type="RelationPropertiesVwModel">
                 <CustomProperties>
                   <OID>27</OID>
-                  <Parent>19</Parent>
+                  <Parent>20</Parent>
                 </CustomProperties>
                 <Children>
                   <Model xsi:type="RelationPropertyVwModel">
@@ -524,7 +524,7 @@
                 </Children>
                 <Location>
                   <X>0 px</X>
-                  <Y>108 px</Y>
+                  <Y>90 px</Y>
                 </Location>
                 <Size>
                   <Width>145 px</Width>
@@ -543,15 +543,15 @@
             </Location>
             <Size>
               <Width>150 px</Width>
-              <Height>194 px</Height>
+              <Height>176 px</Height>
             </Size>
             <MinSize>
               <Width>100 px</Width>
-              <Height>194 px</Height>
+              <Height>176 px</Height>
             </MinSize>
             <MaxSize>
               <Width>800 px</Width>
-              <Height>194 px</Height>
+              <Height>176 px</Height>
             </MaxSize>
             <Ports />
             <Oid xsi:type="SchemaModelOID">
@@ -1055,7 +1055,7 @@
           <Model xsi:type="AssociationVwModel">
             <CustomProperties>
               <OID>55</OID>
-              <OutModel>19</OutModel>
+              <OutModel>20</OutModel>
               <InModel>29</InModel>
               <OutPort>56</OutPort>
               <InPort>57</InPort>
@@ -1065,7 +1065,7 @@
               <Port>
                 <Location>
                   <X>0 px</X>
-                  <Y>153 px</Y>
+                  <Y>138.80412371134 px</Y>
                 </Location>
                 <Anchors>Top Bottom</Anchors>
                 <Align>Right</Align>
@@ -1090,7 +1090,7 @@
             <BendPoints>
               <PointD>
                 <X>106 px</X>
-                <Y>369 px</Y>
+                <Y>354.80412371134 px</Y>
               </PointD>
               <PointD>
                 <X>106 px</X>
diff --git a/FSSiegen.edps b/FSSiegen.edps
index e984ad0..ea0b62f 100644
--- a/FSSiegen.edps
+++ b/FSSiegen.edps
@@ -14,6 +14,7 @@
         <File Name="Interaction.Generated.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" />
         <File Name="UserType.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" />
         <File Name="InteractionType.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" />
+        <File Name="UserGroup.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" />
       </GeneratedFiles>
     </Generation>
     <DatabaseFirstNamingRules>
diff --git a/FSSiegen.efml b/FSSiegen.efml
index c32d8c8..9ba84eb 100644
--- a/FSSiegen.efml
+++ b/FSSiegen.efml
@@ -48,6 +48,9 @@
     <property name="Groups" type="String" p1:ValidateRequired="true" p1:Guid="bf41429c-3b00-4d34-9851-bf35a3649fd2">
       <column name="" />
     </property>
+    <property name="ForceLogout" type="Boolean" p1:ValidateRequired="true" p1:Guid="bfc9e3b2-f7cb-4b9b-a3e9-68f84d16bcae">
+      <column name="" />
+    </property>
   </class>
   <class name="Prospect" entity-set="Prospects" p1:Guid="2f24182f-047a-4dba-a926-ddb2044ce3a3">
     <id name="Id" type="Guid" value-generated="OnAdd" p1:ValidateRequired="true" p1:Guid="be4ea414-f058-4b82-ab45-43750869702c">
@@ -59,9 +62,6 @@
     <property name="Name" type="String" p1:ValidateRequired="true" p1:Guid="25eda2da-aff0-45a6-bb11-f19420f21b62">
       <column name="" />
     </property>
-    <property name="ProgressId" type="Guid" p1:ValidateRequired="true" p1:Guid="db78282f-9001-4e54-a175-fe4391e714fc">
-      <column name="" />
-    </property>
     <property name="Created" type="DateTime" p1:ValidateRequired="true" p1:Guid="12d616f2-eee0-4dbc-9a24-fecb7e65e9ba">
       <column name="" />
     </property>
diff --git a/FoodsharingSiegen.Contracts/Entity/Interaction.Generated.cs b/FoodsharingSiegen.Contracts/Entity/Interaction.Generated.cs
index 406f1e2..a8bcac6 100644
--- a/FoodsharingSiegen.Contracts/Entity/Interaction.Generated.cs
+++ b/FoodsharingSiegen.Contracts/Entity/Interaction.Generated.cs
@@ -2,7 +2,7 @@
 // This is auto-generated code.
 //------------------------------------------------------------------------------
 // This code was generated by Entity Developer tool using EF Core template.
-// Code is generated on: 11.04.2022 13:40:57
+// Code is generated on: 11.04.2022 17:16:51
 //
 // Changes to this file may cause incorrect behavior and will be lost if
 // the code is regenerated.
diff --git a/FoodsharingSiegen.Contracts/Entity/InteractionType.cs b/FoodsharingSiegen.Contracts/Entity/InteractionType.cs
index 2b0dbde..8da40ca 100644
--- a/FoodsharingSiegen.Contracts/Entity/InteractionType.cs
+++ b/FoodsharingSiegen.Contracts/Entity/InteractionType.cs
@@ -2,7 +2,7 @@
 // This is auto-generated code.
 //------------------------------------------------------------------------------
 // This code was generated by Entity Developer tool using EF Core template.
-// Code is generated on: 11.04.2022 13:40:57
+// Code is generated on: 11.04.2022 17:16:51
 //
 // Changes to this file may cause incorrect behavior and will be lost if
 // the code is regenerated.
diff --git a/FoodsharingSiegen.Contracts/Entity/Prospect.Generated.cs b/FoodsharingSiegen.Contracts/Entity/Prospect.Generated.cs
index d539e7b..03f3adc 100644
--- a/FoodsharingSiegen.Contracts/Entity/Prospect.Generated.cs
+++ b/FoodsharingSiegen.Contracts/Entity/Prospect.Generated.cs
@@ -2,7 +2,7 @@
 // This is auto-generated code.
 //------------------------------------------------------------------------------
 // This code was generated by Entity Developer tool using EF Core template.
-// Code is generated on: 11.04.2022 13:40:57
+// Code is generated on: 11.04.2022 17:16:51
 //
 // Changes to this file may cause incorrect behavior and will be lost if
 // the code is regenerated.
@@ -32,8 +32,6 @@ namespace FoodsharingSiegen.Contracts.Entity
 
         public virtual string Name { get; set; }
 
-        public virtual Guid ProgressId { get; set; }
-
         public virtual DateTime Created { get; set; }
 
         public virtual string Memo { get; set; }
diff --git a/FoodsharingSiegen.Contracts/Entity/User.Generated.cs b/FoodsharingSiegen.Contracts/Entity/User.Generated.cs
index e448c67..f173947 100644
--- a/FoodsharingSiegen.Contracts/Entity/User.Generated.cs
+++ b/FoodsharingSiegen.Contracts/Entity/User.Generated.cs
@@ -2,7 +2,7 @@
 // This is auto-generated code.
 //------------------------------------------------------------------------------
 // This code was generated by Entity Developer tool using EF Core template.
-// Code is generated on: 11.04.2022 13:40:57
+// Code is generated on: 11.04.2022 17:16:51
 //
 // Changes to this file may cause incorrect behavior and will be lost if
 // the code is regenerated.
diff --git a/FoodsharingSiegen.Contracts/Entity/UserGroup.cs b/FoodsharingSiegen.Contracts/Entity/UserGroup.cs
index 35a1e93..33f9279 100644
--- a/FoodsharingSiegen.Contracts/Entity/UserGroup.cs
+++ b/FoodsharingSiegen.Contracts/Entity/UserGroup.cs
@@ -2,7 +2,7 @@
 // This is auto-generated code.
 //------------------------------------------------------------------------------
 // This code was generated by Entity Developer tool using EF Core template.
-// Code is generated on: 11.04.2022 13:40:57
+// Code is generated on: 11.04.2022 17:16:51
 //
 // Changes to this file may cause incorrect behavior and will be lost if
 // the code is regenerated.
diff --git a/FoodsharingSiegen.Contracts/Entity/UserType.cs b/FoodsharingSiegen.Contracts/Entity/UserType.cs
index 52a1bd9..59beabf 100644
--- a/FoodsharingSiegen.Contracts/Entity/UserType.cs
+++ b/FoodsharingSiegen.Contracts/Entity/UserType.cs
@@ -2,7 +2,7 @@
 // This is auto-generated code.
 //------------------------------------------------------------------------------
 // This code was generated by Entity Developer tool using EF Core template.
-// Code is generated on: 11.04.2022 13:40:57
+// Code is generated on: 11.04.2022 17:16:51
 //
 // Changes to this file may cause incorrect behavior and will be lost if
 // the code is regenerated.
diff --git a/FoodsharingSiegen.Server/Data/FsContext.Generated.cs b/FoodsharingSiegen.Server/Data/FsContext.Generated.cs
index c548310..6744edb 100644
--- a/FoodsharingSiegen.Server/Data/FsContext.Generated.cs
+++ b/FoodsharingSiegen.Server/Data/FsContext.Generated.cs
@@ -2,7 +2,7 @@
 // This is auto-generated code.
 //------------------------------------------------------------------------------
 // This code was generated by Entity Developer tool using EF Core template.
-// Code is generated on: 11.04.2022 13:40:57
+// Code is generated on: 11.04.2022 17:16:51
 //
 // Changes to this file may cause incorrect behavior and will be lost if
 // the code is regenerated.
@@ -118,7 +118,6 @@ namespace FoodsharingSiegen.Server.Data
             modelBuilder.Entity<Prospect>().Property(x => x.Id).HasColumnName(@"Id").IsRequired().ValueGeneratedOnAdd();
             modelBuilder.Entity<Prospect>().Property(x => x.FsId).HasColumnName(@"FsId").IsRequired().ValueGeneratedNever();
             modelBuilder.Entity<Prospect>().Property(x => x.Name).HasColumnName(@"Name").IsRequired().ValueGeneratedNever();
-            modelBuilder.Entity<Prospect>().Property(x => x.ProgressId).HasColumnName(@"ProgressId").IsRequired().ValueGeneratedNever();
             modelBuilder.Entity<Prospect>().Property(x => x.Created).HasColumnName(@"Created").IsRequired().ValueGeneratedNever();
             modelBuilder.Entity<Prospect>().Property(x => x.Memo).HasColumnName(@"Memo").ValueGeneratedNever();
             modelBuilder.Entity<Prospect>().HasKey(@"Id");
diff --git a/FoodsharingSiegen.Server/app.db-shm b/FoodsharingSiegen.Server/app.db-shm
index b8fc390..6cc18ac 100644
Binary files a/FoodsharingSiegen.Server/app.db-shm and b/FoodsharingSiegen.Server/app.db-shm differ
diff --git a/FoodsharingSiegen.Server/app.db-wal b/FoodsharingSiegen.Server/app.db-wal
index 2dc3a3f..e5adf8a 100644
Binary files a/FoodsharingSiegen.Server/app.db-wal and b/FoodsharingSiegen.Server/app.db-wal differ