diff --git a/copri4/main/src/Mod/APIjsonserver.pm b/copri4/main/src/Mod/APIjsonserver.pm
index 6e89665..5fa3bf5 100755
--- a/copri4/main/src/Mod/APIjsonserver.pm
+++ b/copri4/main/src/Mod/APIjsonserver.pm
@@ -102,6 +102,11 @@ if(!$coo && !$q->param('merchant_id')){
      print $jrout;
      return Apache2::Const::OK;
      exit 0;	
+}else{
+  ($aowner,my $return_merchant) = $apif->fetch_merchant($q,\%varenv,$coo,$q->param('merchant_id'));
+  if($aowner && ($aowner == 195 || $aowner == 185 || $aowner == 176)){
+    $response->{agb_html} = "site/agb_konrad_1.html";
+  }
 }
 
 #If param>40 || value > 400 then exit
diff --git a/copri4/main/src/scripts/Ilockit_cloud.pl b/copri4/main/src/scripts/Ilockit_cloud.pl
index abedaed..2922094 100755
--- a/copri4/main/src/scripts/Ilockit_cloud.pl
+++ b/copri4/main/src/scripts/Ilockit_cloud.pl
@@ -215,6 +215,7 @@ sub get_devices {
 sub get_events {
 
  #1. select all devices on content
+ print FILE "ilockit get_events get_devicesONcontent_all\n";
  my $record_cc = get_devicesONcontent_all();
  my $today = DateTime->now( time_zone => "Europe/Berlin" );
  $today .= "Z";
diff --git a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm
index ae9022c..c5c7893 100755
--- a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm
+++ b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm
@@ -71,6 +71,9 @@ sub tpl(){
  $bgcolor1 = $dbt->{website}->{$varenv->{syshost}}->{bgcolor1} if($dbt->{website}->{$varenv->{syshost}}->{bgcolor1});
  $bgcolor1 = $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{bgcolor1} if($dbt->{merchant_ids}->{$varenv->{merchant_id}}->{bgcolor1});
 
+ #print "$dbt->{merchant_ids}->{$varenv->{merchant_id}}->{id}|$varenv->{merchant_id}|$coo";
+ my $aowner = "198";
+ $aowner = $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{id} if($varenv->{merchant_id} && $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{id});
 
  my $ctrel = {};
  $ctrel = $users_sharee if(ref($users_sharee) eq "HASH" && $users_sharee->{c_id});
@@ -129,23 +132,10 @@ sub tpl(){
          my ($e_yy,$e_mo,$e_dd) = split(/-/,$end_date);
          my ($e_hh,$e_mi) = split(/\:/,$end_time);
 
-  my $radID = $R::radID || "";
-
-  my $tink_agb_text;
-  $tink_agb_text = $db->get_content("2351","");
-  $tink_agb_text->{txt01} = $q->unescapeHTML($tink_agb_text->{txt01});
-  $tink_agb_text->{txt01} = $lb->newline($tink_agb_text->{txt01},"","0");
-
-  my $konrad_agb_text;
-  $konrad_agb_text = $db->get_content("3446","");
-  $konrad_agb_text->{txt01} = $q->unescapeHTML($konrad_agb_text->{txt01});
-  $konrad_agb_text->{txt01} = $lb->newline($konrad_agb_text->{txt01},"","0");
-
-  #TODO get and edit sharee AGB from Tarif content
-  my $sharee_agb_text;
+  my $sharee_agb_text = {};
   $sharee_agb_text->{ct_name} = "AGB";
-  $sharee_agb_text->{txt01} = "<iframe src='$varenv->{wwwhost}/site/agb.html' style='width:100%;height:10000px;border:none;' scrolling='auto'></iframe>";
-
+  $sharee_agb_text->{txt01} = "<iframe src='$varenv->{wwwhost}/site/agb.html' style='width:100%;height:8000px;border:none;' scrolling='auto'></iframe>";
+  $sharee_agb_text->{txt01} = "<iframe src='$varenv->{wwwhost}/site/agb_konrad_1.html' style='width:100%;height:8000px;border:none;' scrolling='auto'></iframe>" if($aowner == 195 || $aowner == 185 || $aowner == 176);
 
   print "<div id='Contentapp'>\n";
 
@@ -535,21 +525,7 @@ Weitere Personen aus Ihrem Haushalt profitieren jedoch ebenfalls, falls Sie weit
 	  print $q->label({-for=>"$key", -style=>'padding-top:20px;'},"$label_des"),"\n";
           print $q->div({-id=>"$key"},$but->checkbox("1","$key","$ctrel->{$key}","","$required","$autofocus"), " $sharee_agb"),"\n";
 	  print $q->hidden(-name=>"$key",-override=>1,-value=>"null");
-        }
 
-	#look also Shareework.pm save_account ret value
-	elsif(1==2 && $key =~ /int15/){#Konrad AGB
-	  $required=1 if($varenv->{wwwhost} =~ /konrad/);
-	  my $konrad_agb = "<button type='button' class='btn btn-primary ' style='padding:1px 20px;' data-toggle='modal' data-target='#konrad_agb'>$des</button>\n";
-    	  print $q->label({-for=>"$key", -style=>'padding-top:20px;'},"$label_des"),"\n";
-          print $q->div({-id=>"$key"},$but->checkbox("3429","$key","$ctrel->{$key}","","$required"), " $konrad_agb"),"\n";
-          print $q->hidden(-name=>"$key",-override=>1,-value=>"0");
-	}elsif(1==2 && $key =~ /int14/){#TINK AGB
-	  $required=1 if($varenv->{wwwhost} !~ /konrad/);
-	  my $tink_agb = "<button type='button' class='btn btn-primary ' style='padding:1px 20px;background-color:#0061a1;border:1px solid #0061a1;' data-toggle='modal' data-target='#tink_agb'>$des</button>\n";
-    	  print $q->label({-for=>"$key", -style=>'padding-top:20px;'},"$label_des"),"\n";
-          print $q->div({-id=>"$key"},$but->checkbox("3428","$key","$ctrel->{$key}","","$required"), " $tink_agb"),"\n";
-          print $q->hidden(-name=>"$key",-override=>1,-value=>"0");
         }elsif(1==2 && $key =~ /int02/){#newsletter
 	  if($varenv->{wwwhost} !~ /konrad/){
     	  	print $q->label({-for=>"$key", -style=>'padding-top:10px;'},""),"\n";