diff --git a/BeWo/View/Detail/OrganisationView.xaml b/BeWo/View/Detail/OrganisationView.xaml
index 01907587c..ad3cc1df6 100644
--- a/BeWo/View/Detail/OrganisationView.xaml
+++ b/BeWo/View/Detail/OrganisationView.xaml
@@ -564,7 +564,8 @@
                                             Grid.ColumnSpan="3"
                                             Margin="0,8,0,0"
                                             Header="GKV-Abrechnung"
-                                            Style="{StaticResource ObjectEditGroupBox}">
+                                            Style="{StaticResource ObjectEditGroupBox}"
+                                            Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
                                             <GroupBox.Resources>
                                                 <ResourceDictionary>
                                                     <ResourceDictionary.MergedDictionaries>
@@ -642,8 +643,7 @@
                                                     Click="button_ik_ermitteln_click"
                                                     IsEnabled="{Binding IsIKNumberValid}"
                                                     Style="{StaticResource PrimaryButtonSmall}"
-                                                    ToolTip="Daten aus Kostenträgerdatei ermitteln"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
+                                                    ToolTip="Daten aus Kostenträgerdatei ermitteln">
                                                     <TextBlock Margin="3" TextAlignment="Center">
                                                         GKV-Daten<LineBreak />
                                                         ermitteln</TextBlock>
@@ -653,22 +653,19 @@
                                                 <Label
                                                     Grid.Row="2"
                                                     Grid.Column="0"
-                                                    VerticalAlignment="Center"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
+                                                    VerticalAlignment="Center">
                                                     Ausblenden
                                                 </Label>
                                                 <CheckBox
                                                     Grid.Row="2"
                                                     Grid.Column="1"
-                                                    IsChecked="{Binding GkvAusblenden, UpdateSourceTrigger=PropertyChanged}"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
+                                                    IsChecked="{Binding GkvAusblenden, UpdateSourceTrigger=PropertyChanged}" />
 
                                                 <Label
                                                     x:Name="label_verfahrensstufe"
                                                     Grid.Row="3"
                                                     Grid.Column="0"
-                                                    VerticalAlignment="Center"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
+                                                    VerticalAlignment="Center">
                                                     Verfahrensstufe
                                                 </Label>
                                                 <StackPanel
@@ -677,8 +674,7 @@
                                                     Grid.RowSpan="3"
                                                     Grid.Column="1"
                                                     Margin="0,4,0,0"
-                                                    Orientation="Vertical"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
+                                                    Orientation="Vertical">
                                                     <StackPanel.Resources>
                                                         <Style TargetType="RadioButton">
                                                             <Setter Property="Padding" Value="2" />
@@ -709,8 +705,7 @@
                                                     Grid.Row="0"
                                                     Grid.Column="3"
                                                     VerticalAlignment="Center"
-                                                    ToolTip="Bezeichnung Datenannahmestelle"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
+                                                    ToolTip="Bezeichnung Datenannahmestelle">
                                                     Datenannahmestelle
                                                 </Label>
                                                 <TextBox
@@ -721,15 +716,13 @@
                                                     IsEnabled="False"
                                                     Text="{Binding Path=BezDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}"
                                                     ToolTip="{Binding Path=BezDatenannahmestelle, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
-                                                    ToolTipService.ShowOnDisabled="True"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
+                                                    ToolTipService.ShowOnDisabled="True" />
 
                                                 <Label
                                                     Grid.Row="1"
                                                     Grid.Column="3"
                                                     VerticalAlignment="Center"
-                                                    ToolTip="Hausanschrift der Datenannahmestelle"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
+                                                    ToolTip="Hausanschrift der Datenannahmestelle">
                                                     Hausanschrift
                                                 </Label>
                                                 <TextBox
@@ -737,15 +730,13 @@
                                                     Grid.Row="1"
                                                     Grid.Column="4"
                                                     IsEnabled="False"
-                                                    Text="{Binding Path=HausanschriftDatenannahmestelle, Converter={StaticResource AddressToStringConverter}, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
+                                                    Text="{Binding Path=HausanschriftDatenannahmestelle, Converter={StaticResource AddressToStringConverter}, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
 
                                                 <Label
                                                     Grid.Row="2"
                                                     Grid.Column="3"
                                                     VerticalAlignment="Center"
-                                                    ToolTip="Postfachanschrift der Datenannahmestelle"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
+                                                    ToolTip="Postfachanschrift der Datenannahmestelle">
                                                     Postfachanschrift
                                                 </Label>
                                                 <TextBox
@@ -753,15 +744,13 @@
                                                     Grid.Row="2"
                                                     Grid.Column="4"
                                                     IsEnabled="False"
-                                                    Text="{Binding Path=PostfachanschriftDatenannahmestelle, Converter={StaticResource AddressToStringConverter}, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
+                                                    Text="{Binding Path=PostfachanschriftDatenannahmestelle, Converter={StaticResource AddressToStringConverter}, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
 
                                                 <Label
                                                     Grid.Row="3"
                                                     Grid.Column="3"
                                                     VerticalAlignment="Center"
-                                                    ToolTip="Großkundenanschrift der Datenannahmestelle"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
+                                                    ToolTip="Großkundenanschrift der Datenannahmestelle">
                                                     Großkundenanschrift
                                                 </Label>
                                                 <TextBox
@@ -769,14 +758,11 @@
                                                     Grid.Row="3"
                                                     Grid.Column="4"
                                                     IsEnabled="False"
-                                                    Text="{Binding Path=GrosskundenanschriftDatenannahmestelle, Converter={StaticResource AddressToStringConverter}, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
-
+                                                    Text="{Binding Path=GrosskundenanschriftDatenannahmestelle, Converter={StaticResource AddressToStringConverter}, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
                                                 <Label
                                                     Grid.Row="4"
                                                     Grid.Column="3"
-                                                    VerticalAlignment="Center"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
+                                                    VerticalAlignment="Center">
                                                     IK Datenannahmestelle
                                                 </Label>
                                                 <TextBox
@@ -787,13 +773,11 @@
                                                     IsEnabled="False"
                                                     Text="{Binding Path=IKDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}"
                                                     ToolTip="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationIKNumber}}"
-                                                    ToolTipService.ShowOnDisabled="True"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
+                                                    ToolTipService.ShowOnDisabled="True" />
                                                 <Label
                                                     Grid.Row="5"
                                                     Grid.Column="3"
-                                                    VerticalAlignment="Center"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
+                                                    VerticalAlignment="Center">
                                                     IK Kostenträger
                                                 </Label>
                                                 <TextBox
@@ -804,8 +788,7 @@
                                                     IsEnabled="False"
                                                     Text="{Binding Path=IKKostentrager, UpdateSourceTrigger=PropertyChanged}"
                                                     ToolTip="{Binding Path=IKKostentrager, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationIKNumber}}"
-                                                    ToolTipService.ShowOnDisabled="True"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
+                                                    ToolTipService.ShowOnDisabled="True" />
                                             </Grid>
                                         </GroupBox>
                                         <GroupBox