diff -r ddc6d80c5f7d -r 87eec0c11516 src/cm/models.py
--- a/src/cm/models.py	Wed Feb 03 14:27:07 2010 +0100
+++ b/src/cm/models.py	Wed Feb 03 15:06:03 2010 +0100
@@ -357,8 +357,9 @@
 
 class ConfigurationManager(models.Manager):
     def set_workspace_name(self, workspace_name):
-        if workspace_name and not self.get_key('workspace_name')!=u'Workspace':
-            self.set_key('workspace_name', _(u"%(workspace_name)s's workspace") %{'workspace_name':workspace_name})
+        if workspace_name:
+            #self.set_key('workspace_name', _(u"%(workspace_name)s's workspace") %{'workspace_name':workspace_name})
+            self.set_key('workspace_name', workspace_name)
 
     def get_key(self, key, default_value=None):
         try: