diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 721c1d060..a56894337 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -18,6 +18,7 @@
  - fix [ 1256549 ] Users are allowed to set url to extras or uploads
  - fix [ 1262505 ] Unable to edit group info
  - Added the missing export toolbar icon.
+ - fix [ 1261789 ] fixed(?) can't edit collaboration (Collaboration.pm) (andreasg)
 
 
 6.7.0
diff --git a/docs/upgrades/upgrade_6.7.0-6.7.1.pl b/docs/upgrades/upgrade_6.7.0-6.7.1.pl
index 8438c0be6..9107ffca1 100644
--- a/docs/upgrades/upgrade_6.7.0-6.7.1.pl
+++ b/docs/upgrades/upgrade_6.7.0-6.7.1.pl
@@ -35,7 +35,7 @@ WebGUI::Session::close();
 sub fixForumRichEdit {
         print "\tFixing the forum rich editor properties.\n" unless ($quiet);
 	my $validElements = 'a[name|href|target|title],strong/b[class],em/i[class],strike[class],u[class],p[dir|class|align],ol,ul,li,br,img[class|src|border=0|alt|title|hspace|vspace|width|height|align],sub,sup,blockquote[dir|style],table[border=0|cellspacing|cellpadding|width|height|class|align],tr[class|rowspan|width|height|align|valign],td[dir|class|colspan|rowspan|width|height|align|valign],div[dir|class|align],span[class|align],pre[class|align],address[class|align],h1[dir|class|align],h2[dir|class|align],h3[dir|class|align],h4[dir|class|align],h5[dir|class|align],h6[dir|class|align],hr';
-	WebGUI::SQL->write("update RichEdit set validElements=".quote($prepend)." where assetId='PBrichedit000000000002'");
+	WebGUI::SQL->write("update RichEdit set validElements=".quote($validElements)." where assetId='PBrichedit000000000002'");
 	WebGUI::SQL->write("update assetData set endDate=".(time()+60*60*24*365*20)." where assetId='PBrichedit000000000002'");
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm
index dde6a7095..f2d81be71 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm
@@ -584,7 +584,7 @@ sub getEditForm {
 		-name=>"richEditor",
 		-label=>WebGUI::International::get('rich editor', 'Asset_Collaboration'),
 		-hoverHelp=>WebGUI::International::get('rich editor description', 'Asset_Collaboration'),
-		-options=>WebGUI::SQL->buildHashRef("select assetId, title from asset where className='WebGUI::Asset::RichEdit' order by title"),
+		-options=>WebGUI::SQL->buildHashRef("select distinct(assetData.assetId), assetData.title from asset, assetData where asset.className='WebGUI::Asset::RichEdit' and asset.assetId=assetData.assetId order by assetData.title"),
 		-value=>[$self->getValue("richEditor")]
 		);
         $tabform->getTab("display")->yesNo(