diff --git a/AICore/Context/EntryMapper/PersonNavigationContextEntryMapper.cs b/AICore/Context/EntryMapper/PersonNavigationContextEntryMapper.cs
index f49b0a704..92979107d 100644
--- a/AICore/Context/EntryMapper/PersonNavigationContextEntryMapper.cs
+++ b/AICore/Context/EntryMapper/PersonNavigationContextEntryMapper.cs
@@ -14,8 +14,8 @@ namespace AICore.Context.EntryMapper
 			//pContext.CustomerOid = "---";
 			//pContext.EmployeeOid = "---";
 			pContext.FullName = pObject.FirstNameLastName;
-			pContext.Geschlecht = pObject.Sex.ToString();
-			pContext.Function = pObject.Function.Value;
+			pContext.Geschlecht = pObject.Sex?.ToString();
+			pContext.Function = pObject.Function?.Value;
 		}
 	}
 }
diff --git a/AICore/Facade/LLM/OllamaApiClient.cs b/AICore/Facade/LLM/OllamaApiClient.cs
index bb125d54d..a43eedf77 100644
--- a/AICore/Facade/LLM/OllamaApiClient.cs
+++ b/AICore/Facade/LLM/OllamaApiClient.cs
@@ -55,7 +55,7 @@ namespace AICore.Facade.LLM
 				throw new NotImplementedException();
 			}
 
-			var data = response.Data.models.Select(x => new AiModelDC(x.name, x.details.max_context_size));
+			var data = response.Data.models.Select(x => new AiModelDC(BS.Shared.AiModelSource.ollama, x.name, x.details.max_context_size));
 
 			return ApiResponse<IEnumerable<AiModelDC>>.SuccessResponse(data);
 		}
diff --git a/AICore/Facade/LLM/OpenWebApiClient.cs b/AICore/Facade/LLM/OpenWebApiClient.cs
index fa817ccac..7ca2d6a58 100644
--- a/AICore/Facade/LLM/OpenWebApiClient.cs
+++ b/AICore/Facade/LLM/OpenWebApiClient.cs
@@ -55,7 +55,7 @@ namespace AICore.Facade.LLM
 				throw new NotImplementedException();
 			}
 
-			var data = response.Data.data.Select(x => new AiModelDC(x.name, x.details.max_context_size));
+			var data = response.Data.data.Select(x => new AiModelDC(BS.Shared.AiModelSource.openwebui, x.name, x.details?.max_context_size ?? -2));
 
 			return ApiResponse<IEnumerable<AiModelDC>>.SuccessResponse(data);
 		}
diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index dca813ca8..9e5087528 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -59,7 +59,7 @@ namespace BeWo
 
 		public static string ShortVersion = "3.26";
 
-		public static string Version = "Version 3.26 - 1.2.1 Test";
+		public static string Version = "Version 3.26 - 1.3 AI Test";
 
 		public static int RenderTier = 0;
 		public static bool IsInDesignMode = DesignerProperties.GetIsInDesignMode(new DependencyObject());
diff --git a/BeWo/View/Detail/AI/AiConfigView.xaml b/BeWo/View/Detail/AI/AiConfigView.xaml
index bb8c9ab97..76d70ff06 100644
--- a/BeWo/View/Detail/AI/AiConfigView.xaml
+++ b/BeWo/View/Detail/AI/AiConfigView.xaml
@@ -70,7 +70,7 @@
                     Grid.Row="1"
                     Grid.Column="2"
                     IsEnabled="False"
-                    Value="{Binding Config.Temperature}" />
+                    Value="{Binding Config.Temperature}"/>
 
                 <Label Grid.Row="2" IsEnabled="False">
                     top__p
diff --git a/BeWo/View/Detail/PersonView.xaml b/BeWo/View/Detail/PersonView.xaml
index 0a18f0f2c..9f895318d 100644
--- a/BeWo/View/Detail/PersonView.xaml
+++ b/BeWo/View/Detail/PersonView.xaml
@@ -1,370 +1,835 @@
-<localView:BeWoView x:Class="BeWo.View.Detail.PersonView" 
-                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-                    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" 
-                    xmlns:localView="clr-namespace:BeWo.View" 
-                    xmlns:localSearchView="clr-namespace:BeWo.View.Search" 
-                    xmlns:val="clr-namespace:BeWo.Validation" 
-                    xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
-                    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" 
-                    xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
-                    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
-                    xmlns:security="clr-namespace:BeWo.Security"
-                    Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
-	<Grid x:Name="rootGrid">
-		<Grid.Resources>
-			<dxg:GridControl x:Key="grid_Relations" DataSource="{Binding Path=OrganisationRelations.VMList}">
-				<dxg:GridControl.Columns>
-					<dxg:GridColumn FieldName="Notice" Header="" FixedWidth="True" Width="24" ReadOnly="True">
-						<dxg:GridColumn.CellTemplate>
-							<DataTemplate>
-								<Button Content="r" FontFamily="Webdings" Click="button_removeOrganisationRelation_Click" Width="18" Height="18" VerticalAlignment="Center" />
-							</DataTemplate>
-						</dxg:GridColumn.CellTemplate>
-					</dxg:GridColumn>
-					<dxg:GridColumn FieldName="OrganisationString" Header="Organisation" ReadOnly="True"/>
-          <dxg:GridColumn FieldName="RolleInOrganisation" Header="Rolle" ReadOnly="True"/>
-          <dxg:GridColumn FieldName="Mail" Header="Mail" />
-					<dxg:GridColumn FieldName="Phone" Header="Tel." />
-					<dxg:GridColumn FieldName="Fax" Header="Fax" />
-					<dxg:GridColumn FieldName="Notice" Header="Notiz" />
-				</dxg:GridControl.Columns>
-				<dxg:GridControl.View>
-					<dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" RowDoubleClick="TableView_OnRowDoubleClick" />
-				</dxg:GridControl.View>
-			</dxg:GridControl>
-		</Grid.Resources>
-		<uc:ShadowChrome>
-			<GroupBox Style="{StaticResource MainContentGroupBoxStyle}">
-				<GroupBox.Header>
-					<StackPanel Orientation="Horizontal" VerticalAlignment="Bottom">
-						<Image Source="..\..\Ressources\Icons\AnonymousUserDisabled.png" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" Width="32">
-							<Image.RenderTransform>
-								<TransformGroup>
-									<ScaleTransform ScaleX="1" ScaleY="1" />
-									<SkewTransform AngleX="0" AngleY="0" />
-									<RotateTransform Angle="0" />
-									<TranslateTransform X="0" Y="5" />
-								</TransformGroup>
-							</Image.RenderTransform>
-						</Image>
-						<TextBox x:Name="firstnameTextBox" Text="{Binding FirstName}" Margin="10,0,0,0" Background="{x:Null}" Foreground="#FFFFFFFF" FontSize="22" BorderBrush="{x:Null}" VerticalAlignment="Bottom" Padding="0,0,0,0" />
-						<TextBox Text="{Binding LastName}" Margin="3,0,0,0" Background="{x:Null}" Foreground="#FFFFFFFF" FontSize="22" BorderBrush="{x:Null}" VerticalAlignment="Bottom" Padding="0,0,0,0" />
-					</StackPanel>
-				</GroupBox.Header>
-				<Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}">
-					<Grid.RowDefinitions>
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="*" />
-						<RowDefinition Height="Auto" />
-					</Grid.RowDefinitions>
-					<Rectangle Fill="{StaticResource PersonContentBrush}" Height="6" />
-					<TabControl x:Name="root" Grid.Row="1" Style="{StaticResource ObjectEditTabControl}" BorderThickness="0,0,0,0" Padding="4,4,4,4">
-						<TabItem Header="Details" IsSelected="True">
-							<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
-							<Grid x:Name="grid_details"> 
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="*" />
-									<ColumnDefinition Width="20" />
-									<ColumnDefinition Width="*" />
-								</Grid.ColumnDefinitions>
-								<Grid.RowDefinitions>
-									<RowDefinition Height="Auto" />
-									<RowDefinition Height="Auto" />
-									<RowDefinition Height="Auto" />
-									<RowDefinition Height="*" />
-								</Grid.RowDefinitions>
+<localView:BeWoView
+    x:Class="BeWo.View.Detail.PersonView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+    xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+    xmlns:localSearchView="clr-namespace:BeWo.View.Search"
+    xmlns:localView="clr-namespace:BeWo.View"
+    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+    xmlns:security="clr-namespace:BeWo.Security"
+    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+    xmlns:val="clr-namespace:BeWo.Validation"
+    Width="Auto"
+    Height="Auto"
+    HorizontalAlignment="Stretch"
+    VerticalAlignment="Stretch"
+    Focusable="True">
+    <Grid x:Name="rootGrid">
+        <Grid.Resources>
+            <dxg:GridControl x:Key="grid_Relations" DataSource="{Binding Path=OrganisationRelations.VMList}">
+                <dxg:GridControl.Columns>
+                    <dxg:GridColumn
+                        Width="24"
+                        FieldName="Notice"
+                        FixedWidth="True"
+                        Header=""
+                        ReadOnly="True">
+                        <dxg:GridColumn.CellTemplate>
+                            <DataTemplate>
+                                <Button
+                                    Width="18"
+                                    Height="18"
+                                    VerticalAlignment="Center"
+                                    Click="button_removeOrganisationRelation_Click"
+                                    Content="r"
+                                    FontFamily="Webdings" />
+                            </DataTemplate>
+                        </dxg:GridColumn.CellTemplate>
+                    </dxg:GridColumn>
+                    <dxg:GridColumn
+                        FieldName="OrganisationString"
+                        Header="Organisation"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        FieldName="RolleInOrganisation"
+                        Header="Rolle"
+                        ReadOnly="True" />
+                    <dxg:GridColumn FieldName="Mail" Header="Mail" />
+                    <dxg:GridColumn FieldName="Phone" Header="Tel." />
+                    <dxg:GridColumn FieldName="Fax" Header="Fax" />
+                    <dxg:GridColumn FieldName="Notice" Header="Notiz" />
+                </dxg:GridControl.Columns>
+                <dxg:GridControl.View>
+                    <dxg:TableView
+                        AutoWidth="true"
+                        NavigationStyle="Cell"
+                        RowDoubleClick="TableView_OnRowDoubleClick"
+                        ShowGroupPanel="False"
+                        ShowGroupedColumns="false"
+                        ShowTotalSummary="False" />
+                </dxg:GridControl.View>
+            </dxg:GridControl>
+        </Grid.Resources>
+        <uc:ShadowChrome>
+            <GroupBox Style="{StaticResource MainContentGroupBoxStyle}">
+                <GroupBox.Header>
+                    <StackPanel VerticalAlignment="Bottom" Orientation="Horizontal">
+                        <Image
+                            Width="32"
+                            RenderTransformOrigin="0.5,0.5"
+                            Source="..\..\Ressources\Icons\AnonymousUserDisabled.png"
+                            Stretch="Uniform">
+                            <Image.RenderTransform>
+                                <TransformGroup>
+                                    <ScaleTransform ScaleX="1" ScaleY="1" />
+                                    <SkewTransform AngleX="0" AngleY="0" />
+                                    <RotateTransform Angle="0" />
+                                    <TranslateTransform X="0" Y="5" />
+                                </TransformGroup>
+                            </Image.RenderTransform>
+                        </Image>
+                        <TextBox
+                            x:Name="firstnameTextBox"
+                            Margin="10,0,0,0"
+                            Padding="0,0,0,0"
+                            VerticalAlignment="Bottom"
+                            Background="{x:Null}"
+                            BorderBrush="{x:Null}"
+                            FontSize="22"
+                            Foreground="#FFFFFFFF"
+                            Text="{Binding FirstName}" />
+                        <TextBox
+                            Margin="3,0,0,0"
+                            Padding="0,0,0,0"
+                            VerticalAlignment="Bottom"
+                            Background="{x:Null}"
+                            BorderBrush="{x:Null}"
+                            FontSize="22"
+                            Foreground="#FFFFFFFF"
+                            Text="{Binding LastName}" />
+                    </StackPanel>
+                </GroupBox.Header>
+                <Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Rectangle Height="6" Fill="{StaticResource PersonContentBrush}" />
+                    <TabControl
+                        x:Name="root"
+                        Grid.Row="1"
+                        Padding="4,4,4,4"
+                        BorderThickness="0,0,0,0"
+                        Style="{StaticResource ObjectEditTabControl}">
+                        <TabItem Header="Details" IsSelected="True">
+                            <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
+                                <Grid x:Name="grid_details">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="20" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="*" />
+                                    </Grid.RowDefinitions>
 
-								<GroupBox Header="Eigenschaften" Grid.RowSpan="3" Style="{DynamicResource ObjectEditGroupBox}">
-									<Grid>
-										<Grid.ColumnDefinitions>
-											<ColumnDefinition Width="Auto" />
-											<ColumnDefinition Width="*" />
-										</Grid.ColumnDefinitions>
-										<Grid.RowDefinitions>
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                      <RowDefinition Height="Auto" />
-                      <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="*" />
-										</Grid.RowDefinitions>
+                                    <GroupBox
+                                        Grid.RowSpan="3"
+                                        Header="Eigenschaften"
+                                        Style="{DynamicResource ObjectEditGroupBox}">
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="Auto" />
+                                                <ColumnDefinition Width="*" />
+                                            </Grid.ColumnDefinitions>
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="*" />
+                                            </Grid.RowDefinitions>
 
-										<Label Grid.Column="0" Grid.Row="0" Content="Titel" />
-										<Label Grid.Column="0" Grid.Row="1" Content="Vorname" />
-										<Label Grid.Column="0" Grid.Row="2" Content="Nachname" />
-										<Label Grid.Column="0" Grid.Row="3" Content="Geburtstag" />
-                                        <Label Grid.Column="0" Grid.Row="4" Content="Geschlecht" />
-                    <Label Grid.Column="0" Grid.Row="5" Content="Familienstand" />
-										<Label Grid.Column="0" Grid.Row="6" Content="Funktion" />
-                                        <Label Grid.Column="0" Grid.Row="7"  Content="Staatsangehörigkeit"/>
-                                        <Label  Grid.Column="0" Grid.Row="8" Content="Migrationshintergrund" />
-                    <Label Grid.Column="0" Grid.Row="9" Content="Aufenthaltsstatus"/>
-										<Label x:Name="lblArchiviert" Grid.Column="0" Grid.Row="10" Content="Archiviert" />
-										<Label Grid.Column="0" Grid.Row="11" VerticalAlignment="Top" Content="Notizen" />
+                                            <Label
+                                                Grid.Row="0"
+                                                Grid.Column="0"
+                                                Content="Titel" />
+                                            <Label
+                                                Grid.Row="1"
+                                                Grid.Column="0"
+                                                Content="Vorname" />
+                                            <Label
+                                                Grid.Row="2"
+                                                Grid.Column="0"
+                                                Content="Nachname" />
+                                            <Label
+                                                Grid.Row="3"
+                                                Grid.Column="0"
+                                                Content="Geburtstag" />
+                                            <Label
+                                                Grid.Row="4"
+                                                Grid.Column="0"
+                                                Content="Geschlecht" />
+                                            <Label
+                                                Grid.Row="5"
+                                                Grid.Column="0"
+                                                Content="Familienstand" />
+                                            <Label
+                                                Grid.Row="6"
+                                                Grid.Column="0"
+                                                Content="Funktion" />
+                                            <Label
+                                                Grid.Row="7"
+                                                Grid.Column="0"
+                                                Content="Staatsangehörigkeit" />
+                                            <Label
+                                                Grid.Row="8"
+                                                Grid.Column="0"
+                                                Content="Migrationshintergrund" />
+                                            <Label
+                                                Grid.Row="9"
+                                                Grid.Column="0"
+                                                Content="Aufenthaltsstatus" />
+                                            <Label
+                                                x:Name="lblArchiviert"
+                                                Grid.Row="10"
+                                                Grid.Column="0"
+                                                Content="Archiviert" />
+                                            <Label
+                                                Grid.Row="11"
+                                                Grid.Column="0"
+                                                VerticalAlignment="Top"
+                                                Content="Notizen" />
 
 
 
 
 
 
-                    <uc:NullItemComboBox x:Name="comboBox_Title" Grid.Column="1" Grid.Row="0" Margin="3" Height="23" SelectedValue="{Binding Path=Title, Mode=TwoWay}" />
-										<TextBox Grid.Column="1" Grid.Row="1" Margin="3" Height="23" Text="{Binding Path=FirstName, UpdateSourceTrigger=PropertyChanged}" />
-										<TextBox Grid.Column="1" Grid.Row="2" Margin="3" Height="23" Text="{val:ValidationBinding Path=LastName, UpdateSourceTrigger=PropertyChanged}" />
+                                            <uc:NullItemComboBox
+                                                x:Name="comboBox_Title"
+                                                Grid.Row="0"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                SelectedValue="{Binding Path=Title, Mode=TwoWay}" />
+                                            <TextBox
+                                                Grid.Row="1"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=FirstName, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="2"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{val:ValidationBinding Path=LastName,
+                                                                             UpdateSourceTrigger=PropertyChanged}" />
+
+                                            <!--<uc:MaskedTextBox Grid.Column="1" Grid.Row="3" Mask="00/00/0000" Margin="3" Height="23" Text="{Binding Path=DateOfBirth, Converter={StaticResource DateConverter}, UpdateSourceTrigger=PropertyChanged}" Width="Auto" HorizontalAlignment="Left" />-->
+                                            <dxe:DateEdit
+                                                Grid.Row="3"
+                                                Grid.Column="1"
+                                                Width="100"
+                                                Height="23"
+                                                Margin="3"
+                                                HorizontalAlignment="Left"
+                                                AllowNullInput="True"
+                                                EditValue="{Binding Path=DateOfBirth, UpdateSourceTrigger=PropertyChanged}"
+                                                MaskType="DateTimeAdvancingCaret" />
+                                            <Grid
+                                                Grid.Row="4"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="0,3,0,3">
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="Auto" SharedSizeGroup="RB1" />
+                                                    <ColumnDefinition Width="Auto" SharedSizeGroup="RB1" />
+                                                    <ColumnDefinition Width="*" />
+                                                </Grid.ColumnDefinitions>
+                                                <RadioButton
+                                                    Grid.Column="0"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Left"
+                                                    VerticalAlignment="Center"
+                                                    Content="männlich"
+                                                    IsChecked="{Binding Path=IsMale, UpdateSourceTrigger=PropertyChanged}" />
+                                                <RadioButton
+                                                    Grid.Column="1"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Left"
+                                                    VerticalAlignment="Center"
+                                                    Content="weiblich"
+                                                    IsChecked="{Binding Path=IsFemale, UpdateSourceTrigger=PropertyChanged}" />
+                                                <RadioButton
+                                                    Grid.Column="2"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Left"
+                                                    VerticalAlignment="Center"
+                                                    Content="divers"
+                                                    IsChecked="{Binding Path=IsDivers, UpdateSourceTrigger=PropertyChanged}" />
+                                            </Grid>
+                                            <uc:NullItemComboBox
+                                                Grid.Row="5"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                DisplayMemberPath="Value"
+                                                ItemsSource="{x:Static core:EnumTranslations.FamilyStatusTranslations}"
+                                                SelectedValue="{Binding Path=FamilyStatus}"
+                                                SelectedValuePath="Key" />
+
+                                            <uc:NullItemComboBox
+                                                x:Name="comboBox_Function"
+                                                Grid.Row="6"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                SelectedValue="{Binding Path=Function, Mode=TwoWay}" />
+                                            <uc:NullItemComboBox
+                                                x:Name="comboBox_Nationalitaet"
+                                                Grid.Row="7"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                SelectedValue="{Binding Path=Nationalitaet, Mode=TwoWay}" />
+                                            <CheckBox
+                                                x:Name="chkMigration"
+                                                Grid.Row="8"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3,5,3,1"
+                                                VerticalAlignment="Center"
+                                                IsChecked="{Binding Path=IsMigrant, UpdateSourceTrigger=PropertyChanged}" />
+
+                                            <uc:NullItemComboBox
+                                                x:Name="comboBox_Aufenthalt"
+                                                Grid.Row="9"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                MinWidth="120"
+                                                Margin="3"
+                                                HorizontalAlignment="Stretch"
+                                                SelectedValue="{Binding Path=AufenthaltsStatus, Mode=TwoWay}" />
+
+                                            <CheckBox
+                                                x:Name="chkArchiviert"
+                                                Grid.Row="10"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3,5,3,1"
+                                                VerticalAlignment="Stretch"
+                                                IsChecked="{Binding Path=IsArchived, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="11"
+                                                Grid.RowSpan="3"
+                                                Grid.Column="1"
+                                                Margin="3"
+                                                VerticalAlignment="Stretch"
+                                                AcceptsReturn="True"
+                                                AutoWordSelection="True"
+                                                HorizontalScrollBarVisibility="Hidden"
+                                                Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}"
+                                                TextWrapping="Wrap"
+                                                VerticalScrollBarVisibility="Auto" />
 
-										<!--<uc:MaskedTextBox Grid.Column="1" Grid.Row="3" Mask="00/00/0000" Margin="3" Height="23" Text="{Binding Path=DateOfBirth, Converter={StaticResource DateConverter}, UpdateSourceTrigger=PropertyChanged}" Width="Auto" HorizontalAlignment="Left" />-->
-                                        <dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="1" Grid.Row="3" Height="23" Margin="3" EditValue="{Binding Path=DateOfBirth, UpdateSourceTrigger=PropertyChanged}"  Width="100" HorizontalAlignment="Left" />
-                    <Grid Grid.Column="1" Grid.Row="4" Height="23" Margin="0,3,0,3">
-                      <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" SharedSizeGroup="RB1" />
-                          <ColumnDefinition Width="Auto" SharedSizeGroup="RB1" />
-                        <ColumnDefinition Width="*" />
-                      </Grid.ColumnDefinitions>
-                      <RadioButton Grid.Column="0" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left"
-                                      IsChecked="{Binding Path=IsMale, UpdateSourceTrigger=PropertyChanged}" Content="männlich" />
-                      <RadioButton Grid.Column="1" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left"
-                                      IsChecked="{Binding Path=IsFemale, UpdateSourceTrigger=PropertyChanged}" Content="weiblich" />
-                        <RadioButton Grid.Column="2" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left"
-                                     IsChecked="{Binding Path=IsDivers, UpdateSourceTrigger=PropertyChanged}" Content="divers" />
-                    </Grid>
-                    <uc:NullItemComboBox Grid.Column="1" Grid.Row="5" Margin="3" Height="23"
-                                            ItemsSource="{x:Static core:EnumTranslations.FamilyStatusTranslations}"
-                                            SelectedValue="{Binding Path=FamilyStatus}" DisplayMemberPath="Value"
-                                            SelectedValuePath="Key" />
 
-                    <uc:NullItemComboBox x:Name="comboBox_Function" Grid.Column="1" Grid.Row="6" Margin="3" Height="23" SelectedValue="{Binding Path=Function, Mode=TwoWay}" />
-                    <uc:NullItemComboBox x:Name="comboBox_Nationalitaet" Grid.Column="1" Grid.Row="7"  Margin="3" Height="23" SelectedValue="{Binding Path=Nationalitaet, Mode=TwoWay}" />
-                    <CheckBox  Grid.Column="1" VerticalAlignment="Center" Margin="3,5,3,1" x:Name="chkMigration" Grid.Row="8"
-                                                IsChecked="{Binding Path=IsMigrant, UpdateSourceTrigger=PropertyChanged}" Height="23"/>
 
-                    <uc:NullItemComboBox x:Name="comboBox_Aufenthalt" Grid.Row="9" Grid.Column="1" Margin="3" Height="23" SelectedValue="{Binding Path=AufenthaltsStatus, Mode=TwoWay}" MinWidth="120" HorizontalAlignment="Stretch"/>
-                    
-										<CheckBox x:Name="chkArchiviert" Grid.Column="1" Grid.Row="10" Margin="3,5,3,1" Height="23" IsChecked="{Binding Path=IsArchived, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Stretch" />
-										<TextBox Grid.Row="11" Grid.RowSpan="3" Grid.Column="1" Margin="3" VerticalAlignment="Stretch" VerticalScrollBarVisibility="Auto" AcceptsReturn="True" Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}" HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap" AutoWordSelection="True" />
 
-                                        
-                                        
-                                        
 
 
                                         </Grid>
-								</GroupBox>
+                                    </GroupBox>
 
-								<GroupBox Grid.Column="2" Grid.Row="0" Header="Adresse" Style="{DynamicResource ObjectEditGroupBox}">
-									<Grid>
-										<Grid.RowDefinitions>
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-										</Grid.RowDefinitions>
-										<Grid.ColumnDefinitions>
-											<ColumnDefinition Width="Auto" />
-											<ColumnDefinition Width="*" />
-										</Grid.ColumnDefinitions>
+                                    <GroupBox
+                                        Grid.Row="0"
+                                        Grid.Column="2"
+                                        Header="Adresse"
+                                        Style="{DynamicResource ObjectEditGroupBox}">
+                                        <Grid>
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                            </Grid.RowDefinitions>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="Auto" />
+                                                <ColumnDefinition Width="*" />
+                                            </Grid.ColumnDefinitions>
 
-										<Label Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center" Content="Adresszusatz" />
-                                            <Label Grid.Column="0" Grid.Row="1" Margin="3" VerticalAlignment="Center" Content="Strasse" />
-										<Label Grid.Column="0" Grid.Row="2" Margin="3" VerticalAlignment="Center" Content="Postleitzahl" />
-										<Label Grid.Column="0" Grid.Row="3" Margin="3" VerticalAlignment="Center" Content="Ort" />
+                                            <Label
+                                                Grid.Row="0"
+                                                Grid.Column="0"
+                                                Margin="3"
+                                                VerticalAlignment="Center"
+                                                Content="Adresszusatz" />
+                                            <Label
+                                                Grid.Row="1"
+                                                Grid.Column="0"
+                                                Margin="3"
+                                                VerticalAlignment="Center"
+                                                Content="Strasse" />
+                                            <Label
+                                                Grid.Row="2"
+                                                Grid.Column="0"
+                                                Margin="3"
+                                                VerticalAlignment="Center"
+                                                Content="Postleitzahl" />
+                                            <Label
+                                                Grid.Row="3"
+                                                Grid.Column="0"
+                                                Margin="3"
+                                                VerticalAlignment="Center"
+                                                Content="Ort" />
 
-										<TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" Text="{Binding Path=AddressLine1, UpdateSourceTrigger=PropertyChanged}" />
-										<TextBox Grid.Column="1" Grid.Row="1" Margin="3" Height="23" Text="{Binding Path=Street, UpdateSourceTrigger=PropertyChanged}" />
-										<TextBox Grid.Column="1" Grid.Row="2" Margin="3" Height="23" Text="{Binding Path=PostalCode, UpdateSourceTrigger=PropertyChanged}" />
-										<TextBox Grid.Column="1" Grid.Row="3" Margin="3" Height="23" Text="{Binding Path=Town, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="0"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=AddressLine1, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="1"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=Street, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="2"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=PostalCode, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="3"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=Town, UpdateSourceTrigger=PropertyChanged}" />
 
-									</Grid>
-								</GroupBox>
+                                        </Grid>
+                                    </GroupBox>
 
-								<GroupBox Grid.Column="2" Grid.Row="1" Header="Rechnungsadresse" Style="{DynamicResource ObjectEditGroupBox}">
-									<Grid>
-										<Grid.RowDefinitions>
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-										</Grid.RowDefinitions>
-										<Grid.ColumnDefinitions>
-											<ColumnDefinition Width="80" />
-											<ColumnDefinition Width="*" />
-										</Grid.ColumnDefinitions>
+                                    <GroupBox
+                                        Grid.Row="1"
+                                        Grid.Column="2"
+                                        Header="Rechnungsadresse"
+                                        Style="{DynamicResource ObjectEditGroupBox}">
+                                        <Grid>
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                            </Grid.RowDefinitions>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="80" />
+                                                <ColumnDefinition Width="*" />
+                                            </Grid.ColumnDefinitions>
 
-                                            <Label Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center" Content="Strasse" />
-										<Label Grid.Column="0" Grid.Row="1" Margin="3" VerticalAlignment="Center" Content="Postleitzahl" />
-										<Label Grid.Column="0" Grid.Row="2" Margin="3" VerticalAlignment="Center" Content="Ort" />
+                                            <Label
+                                                Grid.Row="0"
+                                                Grid.Column="0"
+                                                Margin="3"
+                                                VerticalAlignment="Center"
+                                                Content="Strasse" />
+                                            <Label
+                                                Grid.Row="1"
+                                                Grid.Column="0"
+                                                Margin="3"
+                                                VerticalAlignment="Center"
+                                                Content="Postleitzahl" />
+                                            <Label
+                                                Grid.Row="2"
+                                                Grid.Column="0"
+                                                Margin="3"
+                                                VerticalAlignment="Center"
+                                                Content="Ort" />
 
-										<TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" Text="{Binding Path=InvoiceAddressStreet, UpdateSourceTrigger=PropertyChanged}" />
-										<TextBox Grid.Column="1" Grid.Row="1" Margin="3" Height="23" Text="{Binding Path=InvoiceAddressPostalCode, UpdateSourceTrigger=PropertyChanged}" />
-										<TextBox Grid.Column="1" Grid.Row="2" Margin="3" Height="23" Text="{Binding Path=InvoiceAddressTown, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="0"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=InvoiceAddressStreet, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="1"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=InvoiceAddressPostalCode, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="2"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=InvoiceAddressTown, UpdateSourceTrigger=PropertyChanged}" />
 
-									</Grid>
-								</GroupBox>
+                                        </Grid>
+                                    </GroupBox>
 
-								<GroupBox Grid.Column="2" Grid.Row="2" Header="Kontakt" Style="{DynamicResource ObjectEditGroupBox}" Margin="0,20,0,0">
-									<Grid>
-										<Grid.RowDefinitions>
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-                      <RowDefinition Height="Auto" />
-										</Grid.RowDefinitions>
-										<Grid.ColumnDefinitions>
-											<ColumnDefinition Width="80" />
+                                    <GroupBox
+                                        Grid.Row="2"
+                                        Grid.Column="2"
+                                        Margin="0,20,0,0"
+                                        Header="Kontakt"
+                                        Style="{DynamicResource ObjectEditGroupBox}">
+                                        <Grid>
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                            </Grid.RowDefinitions>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="80" />
+                                                <ColumnDefinition Width="Auto" />
+                                                <ColumnDefinition Width="*" />
+                                            </Grid.ColumnDefinitions>
+
+                                            <Label
+                                                Grid.Row="0"
+                                                Grid.Column="0"
+                                                Margin="3"
+                                                VerticalAlignment="Center"
+                                                Content="Handy" />
+                                            <Label
+                                                Grid.Row="1"
+                                                Grid.Column="0"
+                                                Margin="3"
+                                                VerticalAlignment="Center"
+                                                Content="Telefon" />
+                                            <Label
+                                                Grid.Row="2"
+                                                Grid.Column="0"
+                                                Margin="3"
+                                                VerticalAlignment="Center"
+                                                Content="Fax" />
+                                            <Label
+                                                Grid.Row="3"
+                                                Grid.Column="0"
+                                                Margin="3"
+                                                VerticalAlignment="Center"
+                                                Content="Mail" />
+                                            <Label
+                                                Grid.Row="4"
+                                                Grid.Column="0"
+                                                Margin="3"
+                                                VerticalAlignment="Center"
+                                                Content="Homepage" />
+
+                                            <TextBox
+                                                Grid.Row="0"
+                                                Grid.Column="1"
+                                                Grid.ColumnSpan="2"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=PrivateMobilePhone, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="1"
+                                                Grid.Column="1"
+                                                Grid.ColumnSpan="2"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=PrivatePhone, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="2"
+                                                Grid.Column="1"
+                                                Grid.ColumnSpan="2"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=PrivateFax, UpdateSourceTrigger=PropertyChanged}" />
+
+                                            <Button
+                                                Grid.Row="3"
+                                                Grid.Column="1"
+                                                Height="21"
+                                                Margin="3"
+                                                Click="EMailButton_OnClick"
+                                                Content="*"
+                                                FontFamily="Wingdings"
+                                                IsEnabled="{Binding Path=PrivateEMail, Converter={StaticResource ObjectBoolConverter}}" />
+                                            <TextBox
+                                                Grid.Row="3"
+                                                Grid.Column="2"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=PrivateEMail, UpdateSourceTrigger=PropertyChanged}" />
+
+                                            <TextBox
+                                                Grid.Row="4"
+                                                Grid.Column="1"
+                                                Grid.ColumnSpan="2"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=PrivateHomepage, UpdateSourceTrigger=PropertyChanged}" />
+
+                                        </Grid>
+                                    </GroupBox>
+                                </Grid>
+                            </ScrollViewer>
+                        </TabItem>
+                        <TabItem
+                            Name="tabitem_varFields"
+                            Header="{markup:Translate PersonVarFieldsTitle}"
+                            IsSelected="True">
+                            <ScrollViewer VerticalScrollBarVisibility="Auto">
+                                <localView:VarFieldView VarFieldList="{Binding VarFields}" />
+                            </ScrollViewer>
+                        </TabItem>
+                        <TabItem Header="Organisationen" Selector.Selected="TabItemOrganisations_Selected">
+                            <Grid>
+
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
+
+                                <GroupBox
+                                    x:Name="groupbox_newOrganisation"
+                                    Header="Neue Zuordnung hinzufügen"
+                                    Style="{DynamicResource ObjectEditGroupBox}">
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="Auto" />
-											<ColumnDefinition Width="*" />
-										</Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                        </Grid.RowDefinitions>
 
-										<Label Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center" Content="Handy" />
-										<Label Grid.Column="0" Grid.Row="1" Margin="3" VerticalAlignment="Center" Content="Telefon" />
-										<Label Grid.Column="0" Grid.Row="2" Margin="3" VerticalAlignment="Center" Content="Fax" />
-										<Label Grid.Column="0" Grid.Row="3" Margin="3" VerticalAlignment="Center" Content="Mail" />
-                    <Label Grid.Column="0" Grid.Row="4" Margin="3" VerticalAlignment="Center" Content="Homepage" />
+                                        <Label Grid.Row="0" Grid.Column="0">Organisation</Label>
+                                        <Label Grid.Row="1" Grid.Column="0">
+                                            Mail
+                                        </Label>
+                                        <Label Grid.Row="2" Grid.Column="0">
+                                            Telefon
+                                        </Label>
+                                        <Label Grid.Row="3" Grid.Column="0">Fax</Label>
+                                        <Label Grid.Row="1" Grid.Column="2">Notiz</Label>
+                                        <Label Grid.Row="0" Grid.Column="2">Rolle in der Organisation</Label>
 
-                                        <TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="0" Margin="3" Height="23" Text="{Binding Path=PrivateMobilePhone, UpdateSourceTrigger=PropertyChanged}" />
-                                        <TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="1" Margin="3" Height="23" Text="{Binding Path=PrivatePhone, UpdateSourceTrigger=PropertyChanged}" />
-										<TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="2" Margin="3" Height="23" Text="{Binding Path=PrivateFax, UpdateSourceTrigger=PropertyChanged}" />
+                                        <uc:PopUpEdit
+                                            Name="popupedit_organisation"
+                                            Grid.Row="0"
+                                            Grid.Column="1"
+                                            Height="23"
+                                            Margin="3"
+                                            Cursor="Arrow"
+                                            DeleteButtonVisibility="Collapsed"
+                                            IsReadOnly="True"
+                                            NewButtonVisibility="Visible"
+                                            NewClick="popupedit_organisation_NewClick"
+                                            PopUpClick="popupedit_organisation_PopUpClick"
+                                            PreviewMouseDoubleClick="Popupedit_organisation_OnPreviewMouseDoubleClick"
+                                            Text="{val:ValidationBinding Path=OrganisationRelations.NewVM.OrganisationString,
+                                                                         UpdateSourceTrigger=PropertyChanged}" />
 
-                                        <Button Grid.Column="1" Grid.Row="3" Margin="3" Height="21" Content="*" FontFamily="Wingdings" Click="EMailButton_OnClick" IsEnabled="{Binding Path=PrivateEMail, Converter={StaticResource ObjectBoolConverter}}"/>
-										<TextBox Grid.Column="2" Grid.Row="3" Margin="3" Height="23" Text="{Binding Path=PrivateEMail, UpdateSourceTrigger=PropertyChanged}" />
-
-                    <TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="4" Margin="3" Height="23" Text="{Binding Path=PrivateHomepage, UpdateSourceTrigger=PropertyChanged}" />
-
-									</Grid>
-								</GroupBox>
-							</Grid>
-							</ScrollViewer>
-						</TabItem>
-                        <TabItem Header="{markup:Translate PersonVarFieldsTitle}" IsSelected="True" Name="tabitem_varFields">
-							<ScrollViewer VerticalScrollBarVisibility="Auto">
-								<localView:VarFieldView VarFieldList="{Binding VarFields}" />
-							</ScrollViewer>
-						</TabItem>
-						<TabItem Header="Organisationen" Selector.Selected="TabItemOrganisations_Selected">
-							<Grid>
-								
-								<Grid.RowDefinitions>
-									<RowDefinition Height="Auto" />
-									<RowDefinition Height="*" />
-								</Grid.RowDefinitions>
-
-								<GroupBox x:Name="groupbox_newOrganisation" Header="Neue Zuordnung hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
-									<Grid>
-										<Grid.ColumnDefinitions>
-											<ColumnDefinition Width="Auto" />
-											<ColumnDefinition Width="*" />
-											<ColumnDefinition Width="Auto" />
-											<ColumnDefinition Width="*" />
-										</Grid.ColumnDefinitions>
-										<Grid.RowDefinitions>
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
-                      <RowDefinition Height="Auto" />
-										</Grid.RowDefinitions>
-
-										<Label Grid.Column="0" Grid.Row="0">Organisation</Label>
-										<Label Grid.Column="0" Grid.Row="1">
-											Mail
-										</Label>
-										<Label Grid.Column="0" Grid.Row="2">
-											Telefon
-										</Label>
-										<Label Grid.Column="0" Grid.Row="3">Fax</Label>
-										<Label Grid.Column="2" Grid.Row="1">Notiz</Label>
-                    <Label Grid.Column="2" Grid.Row="0">Rolle in der Organisation</Label>
-
-										<uc:PopUpEdit NewButtonVisibility="Visible" 
-                                                      NewClick="popupedit_organisation_NewClick" 
-                                                      IsReadOnly="True" Grid.Column="1" Grid.Row="0" 
-                                                      DeleteButtonVisibility="Collapsed" Height="23" 
-                                                      Margin="3" Name="popupedit_organisation" 
-                                                      PopUpClick="popupedit_organisation_PopUpClick" 
-                                                      Text="{val:ValidationBinding Path=OrganisationRelations.NewVM.OrganisationString, UpdateSourceTrigger=PropertyChanged}" 
-                                                      Cursor="Arrow"
-                                                      PreviewMouseDoubleClick="Popupedit_organisation_OnPreviewMouseDoubleClick"/>
-                    
-										<TextBox Grid.Column="1" Grid.Row="1" Height="23" Margin="3" Name="textbox_mail" Text="{Binding Path=OrganisationRelations.NewVM.Mail, UpdateSourceTrigger=PropertyChanged}" />
-										<TextBox Grid.Column="1" Grid.Row="3" Height="23" Margin="3" Name="textbox_fax" Text="{Binding Path=OrganisationRelations.NewVM.Fax, UpdateSourceTrigger=PropertyChanged}" />
-										<TextBox Grid.Column="1" Grid.Row="2" Height="23" Margin="3" Name="textbox_phone" Text="{Binding Path=OrganisationRelations.NewVM.Phone, UpdateSourceTrigger=PropertyChanged}" />
-										<TextBox Grid.Column="3" Grid.Row="1" VerticalScrollBarVisibility="Auto" AcceptsReturn="True" Grid.RowSpan="2" Margin="3" Name="textbox_notice" Text="{Binding Path=OrganisationRelations.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}" />
+                                        <TextBox
+                                            Name="textbox_mail"
+                                            Grid.Row="1"
+                                            Grid.Column="1"
+                                            Height="23"
+                                            Margin="3"
+                                            Text="{Binding Path=OrganisationRelations.NewVM.Mail, UpdateSourceTrigger=PropertyChanged}" />
+                                        <TextBox
+                                            Name="textbox_fax"
+                                            Grid.Row="3"
+                                            Grid.Column="1"
+                                            Height="23"
+                                            Margin="3"
+                                            Text="{Binding Path=OrganisationRelations.NewVM.Fax, UpdateSourceTrigger=PropertyChanged}" />
+                                        <TextBox
+                                            Name="textbox_phone"
+                                            Grid.Row="2"
+                                            Grid.Column="1"
+                                            Height="23"
+                                            Margin="3"
+                                            Text="{Binding Path=OrganisationRelations.NewVM.Phone, UpdateSourceTrigger=PropertyChanged}" />
+                                        <TextBox
+                                            Name="textbox_notice"
+                                            Grid.Row="1"
+                                            Grid.RowSpan="2"
+                                            Grid.Column="3"
+                                            Margin="3"
+                                            AcceptsReturn="True"
+                                            Text="{Binding Path=OrganisationRelations.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}"
+                                            VerticalScrollBarVisibility="Auto" />
 
 
-                    <!-- neu -->
-                    <uc:NullItemComboBox Grid.Column="3" Grid.Row="0" Margin="3" Height="23"
-                                   x:Name="ComboBox_RoleInOrganisation"
-                                   SelectedItem="{val:ValidationBinding Path=OrganisationRelations.NewVM.RolleInOrganisation}" />
-                    
-                    <!-- alt -->
-                    
-										<Button Height="25" Grid.ColumnSpan="4" Margin="3" Grid.Row="4" Name="button_addOrganisationRelation" Click="button_addOrganisationRelation_Click" HorizontalAlignment="Right">Zuordnung hinzufügen</Button>
-									</Grid>
-								</GroupBox>
+                                        <!--  neu  -->
+                                        <uc:NullItemComboBox
+                                            x:Name="ComboBox_RoleInOrganisation"
+                                            Grid.Row="0"
+                                            Grid.Column="3"
+                                            Height="23"
+                                            Margin="3"
+                                            SelectedItem="{val:ValidationBinding Path=OrganisationRelations.NewVM.RolleInOrganisation}" />
 
-								<GroupBox x:Name="GroupBoxOrganisation" Grid.Column="0" Margin="0 20 0 0" Grid.Row="1" Header="zugeordnete Organisationen" Style="{DynamicResource ObjectEditGroupBox}">
+                                        <!--  alt  -->
+
+                                        <Button
+                                            Name="button_addOrganisationRelation"
+                                            Grid.Row="4"
+                                            Grid.ColumnSpan="4"
+                                            Height="25"
+                                            Margin="3"
+                                            HorizontalAlignment="Right"
+                                            Click="button_addOrganisationRelation_Click">
+                                            Zuordnung hinzufügen
+                                        </Button>
+                                    </Grid>
+                                </GroupBox>
+
+                                <GroupBox
+                                    x:Name="GroupBoxOrganisation"
+                                    Grid.Row="1"
+                                    Grid.Column="0"
+                                    Margin="0,20,0,0"
+                                    Header="zugeordnete Organisationen"
+                                    Style="{DynamicResource ObjectEditGroupBox}" />
 
 
-								</GroupBox>
+                                <Popup
+                                    Name="popup_organisation"
+                                    Grid.Row="6"
+                                    Width="370"
+                                    Height="250"
+                                    Margin="10"
+                                    Closed="popup_Closed"
+                                    Opened="popup_Opened"
+                                    Placement="MousePoint"
+                                    StaysOpen="False">
+                                    <localSearchView:OrganisationSearchView x:Name="organisationSearchView" ItemSelected="OrganisationSearchView_OrganisationSelected" />
+                                </Popup>
 
+                            </Grid>
 
-								<Popup Grid.Row="6" Margin="10" Name="popup_organisation" StaysOpen="False" Placement="MousePoint" Width="370" Height="250" Closed="popup_Closed" Opened="popup_Opened">
-									<localSearchView:OrganisationSearchView ItemSelected="OrganisationSearchView_OrganisationSelected" x:Name="organisationSearchView" />
-								</Popup>
+                        </TabItem>
+                        <TabItem
+                            Name="tabitem_umfeld"
+                            Header="Umfeld"
+                            Selector.Selected="Tabitem_umfeld_OnSelected">
+                            <ScrollViewer VerticalScrollBarVisibility="Auto">
+                                <Grid x:Name="groupbox_Umfeld">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="*" />
+                                    </Grid.RowDefinitions>
 
-							</Grid>
+                                    <GroupBox
+                                        x:Name="groupbox_KlientenListe"
+                                        Grid.Row="0"
+                                        Header="{markup:Translate Zugeordnete Klienten}"
+                                        Style="{DynamicResource ObjectEditGroupBox}">
+                                        <dxg:GridControl
+                                            x:Name="KlientGridControl"
+                                            HorizontalAlignment="Stretch"
+                                            VerticalAlignment="Stretch">
+                                            <dxg:GridControl.Columns>
+                                                <dxg:GridColumn
+                                                    Width="150"
+                                                    AllowEditing="False"
+                                                    FieldName="Name"
+                                                    Header="{markup:Translate Klient}"
+                                                    SortOrder="Ascending" />
+                                                <dxg:GridColumn
+                                                    Width="150"
+                                                    AllowEditing="False"
+                                                    FieldName="Rolle"
+                                                    Header="Rolle" />
+                                                <dxg:GridColumn
+                                                    Width="300"
+                                                    AllowEditing="False"
+                                                    FieldName="Notice"
+                                                    Header="Notiz" />
+                                            </dxg:GridControl.Columns>
+                                            <dxg:GridControl.View>
+                                                <dxg:TableView
+                                                    AutoWidth="False"
+                                                    NavigationStyle="Cell"
+                                                    RowDoubleClick="TableViewUmfeldKlient_OnRowDoubleClick"
+                                                    ShowGroupPanel="False"
+                                                    ShowGroupedColumns="false"
+                                                    ShowTotalSummary="False" />
+                                            </dxg:GridControl.View>
+                                        </dxg:GridControl>
+                                    </GroupBox>
+                                </Grid>
+                            </ScrollViewer>
+                        </TabItem>
+                        <TabItem
+                            Name="tabitem_documents"
+                            Header="Dokumente"
+                            Selector.Selected="tabitem_documents_Selected" />
+                    </TabControl>
+                    <Border
+                        Grid.Row="2"
+                        Grid.ColumnSpan="3"
+                        Height="40"
+                        Margin="0,10,0,0"
+                        VerticalAlignment="Stretch"
+                        Background="#FF000000">
+                        <Border.OpacityMask>
+                            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                <GradientStop Offset="0" Color="#19000000" />
+                                <GradientStop Offset="1" Color="#33FFFFFF" />
+                            </LinearGradientBrush>
+                        </Border.OpacityMask>
 
-						</TabItem>
-						<TabItem Header="Umfeld" Name="tabitem_umfeld" Selector.Selected="Tabitem_umfeld_OnSelected" >
-              <ScrollViewer VerticalScrollBarVisibility="Auto">
-                <Grid x:Name="groupbox_Umfeld">
-                  <Grid.RowDefinitions>
-						        <RowDefinition Height="Auto" />
-						        <RowDefinition Height="Auto" />
-						        <RowDefinition Height="*" />
-					        </Grid.RowDefinitions>
-
-                  <GroupBox x:Name="groupbox_KlientenListe" Grid.Row="0" Header="{markup:Translate Zugeordnete Klienten}" Style="{DynamicResource ObjectEditGroupBox}" >
-                     <dxg:GridControl VerticalAlignment="Stretch" HorizontalAlignment="Stretch" x:Name="KlientGridControl">
-                      <dxg:GridControl.Columns>                      
-                        <dxg:GridColumn FieldName="Name" Header="{markup:Translate Klient}" Width="150" AllowEditing="False" SortOrder="Ascending"/>
-                        <dxg:GridColumn FieldName="Rolle"  Header="Rolle" Width="150" AllowEditing="False" />
-                          <dxg:GridColumn FieldName="Notice"  Header="Notiz" Width="300" AllowEditing="False" />
-                      </dxg:GridControl.Columns>
-                      <dxg:GridControl.View>
-                        <dxg:TableView AutoWidth="False" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" RowDoubleClick="TableViewUmfeldKlient_OnRowDoubleClick"/>
-                      </dxg:GridControl.View>
-                    </dxg:GridControl>               
-                  </GroupBox>
+                    </Border>
+                    <StackPanel
+                        Grid.Row="2"
+                        Height="Auto"
+                        Margin="5,10,0,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+                        <Button
+                            x:Name="BtnDeleteForGood"
+                            Height="25"
+                            Margin="0,0,2,0"
+                            security:DemandUserRight.VisibleDemands="Person_Full_Delete"
+                            Click="BtnDeleteForGood_OnClick"
+                            Content="Endgültig löschen"
+                            IsEnabled="{Binding Path=IsNew, Converter={StaticResource BoolReverseConverter}}" />
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="2"
+                        Grid.ColumnSpan="3"
+                        Height="Auto"
+                        Margin="5,10,0,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+                        <Button
+                            x:Name="btnSave"
+                            Height="25"
+                            Margin="0,0,2,0"
+                            Command="ApplicationCommands.Save"
+                            Content="Speichern" />
+                        <Button
+                            x:Name="btnClose"
+                            Height="25"
+                            Margin="0,0,3,0"
+                            Command="ApplicationCommands.Close"
+                            Content="Schließen" />
+                    </StackPanel>
                 </Grid>
-              </ScrollViewer>
-            </TabItem>
-					    <TabItem Header="Dokumente" Name="tabitem_documents" Selector.Selected="tabitem_documents_Selected" />
-					</TabControl>
-					<Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,10,0,0" VerticalAlignment="Stretch" Background="#FF000000">
-						<Border.OpacityMask>
-							<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-								<GradientStop Color="#19000000" Offset="0" />
-								<GradientStop Color="#33FFFFFF" Offset="1" />
-							</LinearGradientBrush>
-						</Border.OpacityMask>
-
-					</Border>
-				    <StackPanel Grid.Row="2" HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Horizontal" Height="Auto" Margin="5,10,0,0">
-				        <Button security:DemandUserRight.VisibleDemands="Person_Full_Delete" IsEnabled="{Binding Path=IsNew, Converter={StaticResource BoolReverseConverter}}" Content="Endgültig löschen" Margin="0,0,2,0" Height="25" x:Name="BtnDeleteForGood" Click="BtnDeleteForGood_OnClick" />
-				    </StackPanel>
-					<StackPanel Grid.ColumnSpan="3" Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Height="Auto" Margin="5,10,0,0" HorizontalAlignment="Right">
-						<Button x:Name="btnSave" Content="Speichern" Margin="0,0,2,0" Command="ApplicationCommands.Save" Height="25" />
-						<Button x:Name="btnClose" Content="Schließen" Margin="0,0,3,0" Command="ApplicationCommands.Close" Height="25" />
-					</StackPanel>
-				</Grid>
-			</GroupBox>
-		</uc:ShadowChrome>
-	</Grid>
+            </GroupBox>
+        </uc:ShadowChrome>
+    </Grid>
 </localView:BeWoView>
\ No newline at end of file
diff --git a/BeWo/View/Navigation/CustomerNavigationView.xaml.cs b/BeWo/View/Navigation/CustomerNavigationView.xaml.cs
index c66a7d1a3..b1bf10360 100644
--- a/BeWo/View/Navigation/CustomerNavigationView.xaml.cs
+++ b/BeWo/View/Navigation/CustomerNavigationView.xaml.cs
@@ -197,7 +197,7 @@ namespace BeWo.View.Navigation
 			}
 
 			var dict = new Dictionary<TableID, long[]>() {
-				{ TableID.Customer, oids.ToArray()}
+				{ TableID.Customer, oids.Distinct().ToArray()}
 			};
 
 			return dict;
diff --git a/BeWo/View/Navigation/EmployeeNavigationView.xaml.cs b/BeWo/View/Navigation/EmployeeNavigationView.xaml.cs
index c715c313c..44659143e 100644
--- a/BeWo/View/Navigation/EmployeeNavigationView.xaml.cs
+++ b/BeWo/View/Navigation/EmployeeNavigationView.xaml.cs
@@ -103,7 +103,7 @@ namespace BeWo.View.Navigation
 			}
 
 			var dict = new Dictionary<TableID, long[]>() {
-				{ TableID.Employee, oids.ToArray()}
+				{ TableID.Employee, oids.Distinct().ToArray()}
 			};
 
 			return dict;
diff --git a/BeWo/View/Navigation/OrganisationNavigationView.xaml.cs b/BeWo/View/Navigation/OrganisationNavigationView.xaml.cs
index 240e9067d..29d0c6055 100644
--- a/BeWo/View/Navigation/OrganisationNavigationView.xaml.cs
+++ b/BeWo/View/Navigation/OrganisationNavigationView.xaml.cs
@@ -69,7 +69,7 @@ namespace BeWo.View.Navigation
 
 			var dict = new Dictionary<TableID, long[]>() {
 			{
-				TableID.Organisation, oids.ToArray()}
+				TableID.Organisation, oids.Distinct().ToArray()}
 			};
 
 			return dict;
diff --git a/BeWo/View/Navigation/PersonNavigationView.xaml.cs b/BeWo/View/Navigation/PersonNavigationView.xaml.cs
index 9aaf07cde..5749ebd49 100644
--- a/BeWo/View/Navigation/PersonNavigationView.xaml.cs
+++ b/BeWo/View/Navigation/PersonNavigationView.xaml.cs
@@ -21,6 +21,7 @@ using System.Collections;
 using System.Windows.Input;
 using BeWo.Core.Commands;
 using BeWo.ViewModel.View;
+using DevExpress.XtraBars.Docking;
 
 namespace BeWo.View.Navigation
 {
@@ -106,7 +107,7 @@ namespace BeWo.View.Navigation
 
 			var dict = new Dictionary<TableID, long[]>() {
 			{
-				TableID.Person, oids.ToArray()}
+				TableID.Person, oids.Distinct().ToArray()}
 			};
 
 			return dict;
diff --git a/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs b/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs
index 047bdf9bb..f3e3e14f9 100644
--- a/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs
+++ b/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs
@@ -220,7 +220,7 @@ namespace BeWo.View.Navigation
 
 			var dict = new Dictionary<TableID, long[]>() {
 			{
-				TableID.SupportConcept, oids.ToArray()}
+				TableID.SupportConcept, oids.Distinct().ToArray()}
 			};
 
 			return dict;
diff --git a/BeWo/app.config b/BeWo/app.config
index 694c950ad..859aca86a 100644
--- a/BeWo/app.config
+++ b/BeWo/app.config
@@ -14,18 +14,18 @@
         <binding name="BeWoBasicEndpoint" closeTimeout="00:05:00" openTimeout="00:10:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
           <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
           <!--<security mode="None" />-->
-          <security mode="None" />
+          <security mode="Transport" />
           <!-- mode="Transport" für https und "None" sonst-->
         </binding>
         <binding name="BeWoStreamingEndpoint" receiveTimeout="10:10:00" sendTimeout="10:01:00" maxBufferSize="65536" maxReceivedMessageSize="67108864" transferMode="StreamedRequest" useDefaultWebProxy="true" messageEncoding="Text">
           <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
           <!--<security mode="None" />-->
-          <security mode="None" />
+          <security mode="Transport" />
           <!-- mode="Transport" für https und "None" sonst-->
         </binding>
         <binding name="QueryServiceEndpoint" closeTimeout="00:10:00" openTimeout="00:10:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
           <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <security mode="None">
+          <security mode="Transport">
             <transport clientCredentialType="None" proxyCredentialType="None" realm="" />
             <message clientCredentialType="UserName" algorithmSuite="Default" />
           </security>
diff --git a/Data/Entities/AiModel.cs b/Data/Entities/AiModel.cs
index ebb3b0547..bfc7dd224 100644
--- a/Data/Entities/AiModel.cs
+++ b/Data/Entities/AiModel.cs
@@ -14,12 +14,7 @@ namespace BeWo.Data.Entities
 			_Tid = TableID.AiModel;
 		}
 
-		public AiModel(string modelName, int value) : this()
-		{
-			ModelName = modelName;
-			Value = value;
-		}
-
+		public virtual AiModelSource ModelSource { get; set; }
 		public virtual string ModelName { get; set; }
 		public virtual int Value { get; set; }
 
@@ -29,10 +24,14 @@ namespace BeWo.Data.Entities
 		{
 			if (other == null) return 1;
 
-			var comp = ModelName.CompareTo(other.ModelName);
+			var comp = ModelSource.CompareTo(other.ModelSource);
 
 			if (comp != 0) return comp;
 
+			var comp1 = ModelName.CompareTo(other.ModelName);
+
+			if (comp1 != 0) return comp;
+
 			var comp2 = Value.CompareTo(other.Value);
 
 			return comp2;
@@ -41,6 +40,7 @@ namespace BeWo.Data.Entities
 		public override bool Equals(object obj)
 		{
 			return obj is AiModel ent &&
+				ModelSource == ent.ModelSource &&
 				ModelName == ent.ModelName &&
 				Value == ent.Value;
 		}
diff --git a/Data/Mappings/AiModel.hbm.xml b/Data/Mappings/AiModel.hbm.xml
index c6649b76b..3a2f692c0 100644
--- a/Data/Mappings/AiModel.hbm.xml
+++ b/Data/Mappings/AiModel.hbm.xml
@@ -13,6 +13,7 @@
     <property name="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" />
     <property name="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared"  />
     <property name="Notice"/>
+    <property name="ModelSource" type="BS.Shared.AiModelSource, BS.Shared"/>
     <property name="ModelName"/>
     <property name="Value"/>
   </class>
diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user
index 932dd8add..49baaffc7 100644
--- a/Host/Host.csproj.user
+++ b/Host/Host.csproj.user
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <NameOfLastUsedPublishProfile>C:\Projects\Bewo\BeWo - Main\Host\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
diff --git a/Host/Web.Secrets.config.template b/Host/Web.Secrets.config.template
index 7af9b3a0e..ef52dc374 100644
--- a/Host/Web.Secrets.config.template
+++ b/Host/Web.Secrets.config.template
@@ -7,4 +7,10 @@
 
 <appSettings>
   <add key="OpenWebUIKey" value=""/>
+  <add key="OllamaKey" value=""/>
+  <add key="GetGkvSumApiKey" value=""/>
+  <add key="DownloadReportApiKey" value=""/>
+  <add key="OpenrouteServiceApiKey" value="" />
+  <add key="GoogleDistanceMatrixApiKey" value="" />
+  <add key="GkvSecretKey" value="" />
 </appSettings>
\ No newline at end of file
diff --git a/Model/Changes_2025_07_16 AiModelSource.txt b/Model/Changes_2025_07_16 AiModelSource.txt
new file mode 100644
index 000000000..dbb7fdbb2
--- /dev/null
+++ b/Model/Changes_2025_07_16 AiModelSource.txt	
@@ -0,0 +1,2 @@
+ALTER TABLE `aimodel` 
+ADD COLUMN `ModelSource` INT NULL DEFAULT NULL AFTER `SystemEntryID`;
diff --git a/Service/DCEntityMapper/AiModelDC_AiModel.cs b/Service/DCEntityMapper/AiModelDC_AiModel.cs
index c604ac3a0..b22d4b009 100644
--- a/Service/DCEntityMapper/AiModelDC_AiModel.cs
+++ b/Service/DCEntityMapper/AiModelDC_AiModel.cs
@@ -18,6 +18,7 @@ namespace BeWo.Service.DCEntityMapper
 			pDataContract.Oid = pEntity.Oid;
 			pDataContract.Version = pEntity.Version;
 			pDataContract.Notice = pEntity.Notice;
+			pDataContract.ModelSource = pEntity.ModelSource;
 			pDataContract.ModelName = pEntity.ModelName;
 			pDataContract.Value = pEntity.Value;
 
@@ -31,6 +32,7 @@ namespace BeWo.Service.DCEntityMapper
 			pEntity.Oid = pDataContract.Oid;
 			pEntity.Version = pDataContract.Version;
 			pEntity.Notice = pDataContract.Notice;
+			pEntity.ModelSource = pDataContract.ModelSource;
 			pEntity.ModelName = pDataContract.ModelName;
 			pEntity.Value = pDataContract.Value;
 
diff --git a/Service/Plugins/AiService2.cs b/Service/Plugins/AiService2.cs
index b7a4fc456..c7ccbf250 100644
--- a/Service/Plugins/AiService2.cs
+++ b/Service/Plugins/AiService2.cs
@@ -35,7 +35,7 @@ namespace BeWo.Service.Plugins
 		// - DBs
 
 		// ======================[ Config ]======================
-		public AiConfigDC GetAiConfig()
+		public virtual AiConfigDC GetAiConfig()
 		{
 			var configs = DAOFactory.GenericDAO.GetAllActive<AiConfig>();
 
@@ -48,11 +48,16 @@ namespace BeWo.Service.Plugins
 				DAOFactory.GenericDAO.Insert(config);
 			}
 
+			if (config.SelectedModel is null)
+			{
+				config.SelectedModel = getDefaultAiModel();
+			}
+
 			var config_dc = MapperFactory.AiConfig.MapToNewDC(config);
 
 			return config_dc;
 		}
-		public AiConfigDC UpdateAiConfig(AiConfigDC toUpdate)
+		public virtual AiConfigDC UpdateAiConfig(AiConfigDC toUpdate)
 		{
 			if (toUpdate?.Oid is null)
 				throw new InvalidOperationException();
@@ -69,7 +74,7 @@ namespace BeWo.Service.Plugins
 		}
 
 		// ======================[ Models ]======================
-		public IEnumerable<AiModelDC> GetAiModels()
+		public virtual IEnumerable<AiModelDC> GetAiModels()
 		{
 			var models = getAiModels();
 
@@ -78,7 +83,7 @@ namespace BeWo.Service.Plugins
 
 
 		// ======================[ Conversations ]======================
-		public IEnumerable<AiConversationDC> GetAiConversations(AiContextType uicontext, long? oid)
+		public virtual IEnumerable<AiConversationDC> GetAiConversations(AiContextType uicontext, long? oid)
 		{
 			// SearchDAO
 			var current_user = UserRightHelper.GetLoggedInUserWithOid();
@@ -113,7 +118,7 @@ namespace BeWo.Service.Plugins
 			return dcs;
 		}
 
-		public AiConversationDC CreateAiConversation(AiConversationDC conversation, long modell_oid)
+		public virtual AiConversationDC CreateAiConversation(AiConversationDC conversation, long modell_oid)
 		{
 			var config = GetAiConfig();
 
@@ -123,7 +128,7 @@ namespace BeWo.Service.Plugins
 
 			return conv_dc;
 		}
-		public AiConversationDC CreateAiConversationWithMessage(AiConversationDC conversation, long modell_oid, string message)
+		public virtual AiConversationDC CreateAiConversationWithMessage(AiConversationDC conversation, long modell_oid, string message)
 		{
 			var config = GetAiConfig();
 
@@ -135,7 +140,7 @@ namespace BeWo.Service.Plugins
 
 			return conv_dc;
 		}
-		public AiConversationDC CloneAiConversation(long conversation_oid, long? last_message_oid)
+		public virtual AiConversationDC CloneAiConversation(long conversation_oid, long? last_message_oid)
 		{
 			var parent_conv = DAOFactory.GenericDAO.GetByID<AiConversation>(conversation_oid);
 
@@ -180,7 +185,7 @@ namespace BeWo.Service.Plugins
 			return dc;
 		}
 
-		public long UpdateAiConversationDisplayname(long oid, long version, string displayname)
+		public virtual long UpdateAiConversationDisplayname(long oid, long version, string displayname)
 		{
 			var conv = DAOFactory.GenericDAO.GetByID<AiConversation>(oid);
 
@@ -193,7 +198,7 @@ namespace BeWo.Service.Plugins
 			return conv.Version.Value;
 		}
 
-		public void DeleteAiConversation(long conversation_oid)
+		public virtual void DeleteAiConversation(long conversation_oid)
 		{
 			var conversation = DAOFactory.GenericDAO.LoadByID<AiConversation>(conversation_oid);
 
@@ -201,7 +206,7 @@ namespace BeWo.Service.Plugins
 		}
 
 		// ======================[ Conversationmessages ]======================
-		public AiConversationMessageDC[] SendNewMessage(long conversation, string message)
+		public virtual AiConversationMessageDC[] SendNewMessage(long conversation, string message)
 		{
 			var conv = DAOFactory.GenericDAO.LoadByID<AiConversation>(conversation);
 
@@ -210,7 +215,7 @@ namespace BeWo.Service.Plugins
 
 
 		// ======================[ private ]======================
-		private AiConfig getDefaultAiConfig()
+		protected virtual AiConfig getDefaultAiConfig()
 		{
 			var config = new AiConfig();
 
@@ -221,26 +226,31 @@ namespace BeWo.Service.Plugins
 
 			return config;
 		}
-		private AiModel getDefaultAiModel()
+		protected virtual AiModel getDefaultAiModel()
 		{
 			var models = getAiModels();
 
-			var model = models.FirstOrDefault(x => x.ModelName.Contains("llama3.2"))
+			var model = models.FirstOrDefault(x => x.ModelName.Contains("gemma3") && x.ModelName.Contains("12b") && x.ModelName.Contains("max-context"))
+				?? models.FirstOrDefault(x => x.ModelName.Contains("gemma3") && x.ModelName.Contains("12b"))
+				?? models.FirstOrDefault(x => x.ModelName.Contains("gemma3"))
 				?? models.FirstOrDefault(x => x.ModelName.Contains("llama"))
 				?? models.FirstOrDefault();
 
 			return model;
 		}
-		private IEnumerable<AiModel> getAiModels()
+		protected virtual IEnumerable<AiModel> getAiModels()
 		{
 			var current_models = DAOFactory.GenericDAO.GetAll<AiModel>();
+			var current_models_actives = current_models.Where(x => x.IsActive == ActivationTypeId.Active);
 			var current_models_deactives = current_models.Where(x => x.IsActive != ActivationTypeId.Active);
-			var request_models_dc = ServiceFacade.ActiveAiClient.GetAiModelle().GetResponseData();
+			var request_models_dc_ollama = ServiceFacade.OllamaApiClient.GetAiModelle().GetResponseData();
+			var request_models_dc_owui = ServiceFacade.OpenWebApiClient.GetAiModelle().GetResponseData();
+			var request_models_dc = request_models_dc_ollama.Union(request_models_dc_owui);
 			var request_models = MapperFactory.AiModel.MapToNewEntities(request_models_dc);
 
 			var toadd = request_models.Except(current_models);
-			var toremove = current_models.Except(request_models);
-			var toreadd = current_models_deactives.Intersect(toadd);
+			var toremove = current_models_actives.Except(request_models);
+			var toreadd = current_models_deactives.Intersect(request_models);
 
 			DAOFactory.GenericDAO.Insert(toadd);
 			DAOFactory.GenericDAO.Deactivate(toremove);
@@ -251,7 +261,7 @@ namespace BeWo.Service.Plugins
 			return models;
 		}
 
-		private AiConversation createAiConversation(AiContextType uicontext, Dictionary<TableID, long[]> context, long modell_oid, AiDataContextType context_Type)
+		protected virtual AiConversation createAiConversation(AiContextType uicontext, Dictionary<TableID, long[]> context, long modell_oid, AiDataContextType context_Type)
 		{
 			var current_user = UserRightHelper.GetLoggedInUserWithOid();
 			var factory = new AiPromptFactory();
@@ -282,7 +292,7 @@ namespace BeWo.Service.Plugins
 			return conv;
 		}
 
-		private AiConversationMessageDC[] sendNewMessage(AiConversation conv, string message, AiConfigDC config = null)
+		protected virtual AiConversationMessageDC[] sendNewMessage(AiConversation conv, string message, AiConfigDC config = null)
 		{
 			// Hole Config
 			if (config == null)
@@ -324,7 +334,16 @@ namespace BeWo.Service.Plugins
 
 			// Send Request, wait for Response
 			var dt_before_request = DateTime.Now;
-			var response = ServiceFacade.ActiveAiClient.SendAiMessageRequest(payload, out var message2, out var model, out var duration);
+
+			ApiResponse<string> response;
+			string message2, model;
+			int? duration;
+			if (config.SelectedModel.ModelSource == AiModelSource.openwebui)
+				response = ServiceFacade.OpenWebApiClient.SendAiMessageRequest(payload, out message2, out model, out duration);
+			else if (config.SelectedModel.ModelSource == AiModelSource.ollama)
+				response = ServiceFacade.OllamaApiClient.SendAiMessageRequest(payload, out message2, out model, out duration);
+			else
+				throw new NotImplementedException();
 
 			if (!response.Success)
 			{
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index 118f2fd2d..54bd88f1b 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -1411,4 +1411,10 @@ namespace BS.Shared
 		OrganisationSingle = 23,
 		SupportConceptSingle = 24,
 	}
+
+    public enum AiModelSource
+    {
+        openwebui,
+        ollama
+    }
 }
\ No newline at end of file
diff --git a/Shared/DataContracts/Feature/AI/AiModelDC.cs b/Shared/DataContracts/Feature/AI/AiModelDC.cs
index ca0fcd87c..26d3b85ab 100644
--- a/Shared/DataContracts/Feature/AI/AiModelDC.cs
+++ b/Shared/DataContracts/Feature/AI/AiModelDC.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -14,22 +15,28 @@ namespace BS.Shared.DataContracts.Feature.AI
 			
 		}
 
-		public AiModelDC(string name, int value)
+		public AiModelDC(AiModelSource modelSource, string name, int value)
 		{
+			ModelSource = modelSource;
 			ModelName = name;
 			Value = value;
 		}
 
 		public string ModelName { get; set; }
 		public int Value { get; set; }
+		public AiModelSource ModelSource { get; set; }
 
-		public int CompareTo(AiModelDC other)
+		public virtual int CompareTo(AiModelDC other)
 		{
-			if(other == null) return 1;
+			if (other == null) return 1;
 
-			var comp = ModelName.CompareTo(other.ModelName);
+			var comp = ModelSource.CompareTo(other.ModelSource);
 
-			if(comp != 0) return comp;
+			if (comp != 0) return comp;
+
+			var comp1 = ModelName.CompareTo(other.ModelName);
+
+			if (comp1 != 0) return comp;
 
 			var comp2 = Value.CompareTo(other.Value);
 
@@ -38,10 +45,10 @@ namespace BS.Shared.DataContracts.Feature.AI
 
 		public override bool Equals(object obj)
 		{
-			return obj is AiModelDC dc &&
-				Oid == dc.Oid &&
-				ModelName == dc.ModelName &&
-				Value == dc.Value;
+			return obj is AiModelDC ent &&
+				ModelSource == ent.ModelSource &&
+				ModelName == ent.ModelName &&
+				Value == ent.Value;
 		}
 
 		public override int GetHashCode()
@@ -49,6 +56,7 @@ namespace BS.Shared.DataContracts.Feature.AI
 			unchecked
 			{
 				var result = 0;
+				result = (result * 397) ^ ModelSource.GetHashCode();
 				result = (result * 397) ^ ModelName.GetHashCode();
 				result = (result * 397) ^ Value.GetHashCode();
 				return result;
@@ -57,7 +65,7 @@ namespace BS.Shared.DataContracts.Feature.AI
 
 		public override string ToString()
 		{
-			return $"{ModelName}";
+			return $"{ModelName} ({ModelSource})";
 		}
 	}
 }