--- basket/zpt/BasketFolder_template_standard.zpt	2006/04/18 09:48:27	1.11
+++ basket/zpt/BasketFolder_template_standard.zpt	2007/08/14 18:28:17	1.12
@@ -59,12 +59,15 @@ td.vario { background-color:#AC1D15 }
 		<i style="float:right" 
 			tal:condition="isActive">- active set -</i>
 			
-		<a class="setTitleLink" tal:attributes="href item/absolute_url" tal:content="item/title"/>
+		<a class="setTitleLink" tal:condition="item/title" 
+			tal:attributes="href item/absolute_url" tal:content="item/title"/>
+		<a class="setTitleLink" tal:condition="not: item/title" 
+			tal:attributes="href item/absolute_url" tal:content="python:'Untitled Set'"/>
 		<i class="small" 
 			tal:condition="python: 
 				mode == 'private' and here.getActualUserName() != item.owner" 
 			tal:content="python:
-				' [shared set, created by ' + item.owner + ']'" 
+				' [shared set, created by ' + item.owner.split('@')[0] + ']'" 
 		/><i class="small" 
 			tal:condition="python: mode == 'open_intern' and item.owner != here.getActualUserName()" 
 			tal:content="python: