diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index 9adec0e791..9701f13975 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -687,6 +687,7 @@ title_change_password=Change User Password
 change_password_description=Use this view to change an existing user password.
 change_password_instructions=Enter the new password for this user.
 show_all=Show All
+warn_user_was_deleted=User has been deleted
 
 # Check-in messages
 check_in=Check In
diff --git a/source/java/org/alfresco/web/bean/coci/EditOnlineDialog.java b/source/java/org/alfresco/web/bean/coci/EditOnlineDialog.java
index 749c3d4d96..20201eb377 100644
--- a/source/java/org/alfresco/web/bean/coci/EditOnlineDialog.java
+++ b/source/java/org/alfresco/web/bean/coci/EditOnlineDialog.java
@@ -192,9 +192,7 @@ public class EditOnlineDialog extends CCCheckoutFileDialog
          catch (Throwable err)
          {
             try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
-            
-            Utils.addErrorMessage(Application.getMessage(FacesContext.getCurrentInstance(), 
-                     MSG_ERROR_CHECKOUT) + err.getMessage(), err);
+            property.setDocument(null);
          }
       }
    }
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
index 0b5839a8a0..f18622c8e7 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
@@ -1223,7 +1223,19 @@ public class CreateWebsiteWizard extends BaseWizardBean
          item.setLabel(form.getTitle());
          item.setDescription(form.getDescription());
          item.setImage(WebResources.IMAGE_WEBFORM_32);
-         items.add(item);
+         boolean skip = false;
+         for (FormWrapper formWrapper : this.forms)
+         {
+            if (formWrapper.getTitle().equals(form.getTitle()))
+            {
+               skip = true;
+               break;
+            }
+         }
+         if (!skip)
+         {
+            items.add(item);
+         }
       }
       this.formsList = items;
       return items;
@@ -1368,9 +1380,21 @@ public class CreateWebsiteWizard extends BaseWizardBean
          item.setLabel(workflowDef.title);
          item.setDescription(workflowDef.description);
          item.setImage(WebResources.IMAGE_WORKFLOW_32);
-         items.add(item);
+         boolean skip = false;
+         for (WorkflowWrapper workflowWrapper : this.workflows)
+         {
+            if (workflowWrapper.getTitle().equals(workflowDef.getTitle()))
+            {
+               skip = true;
+               break;
+            }
+         }
+         if (!skip)
+         {
+            items.add(item);
+         }
       }
-      
+
       return items;
    }
    
diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java b/source/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java
index 3d921e65ed..d49fc7031e 100644
--- a/source/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java
+++ b/source/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java
@@ -60,6 +60,7 @@ public class UIAssociationEditor extends BaseAssociationEditor
    private static final Log logger = LogFactory.getLog(UIAssociationEditor.class);
    
    public static final String MSG_WARN_CANNOT_VIEW_TARGET_DETAILS = "warn_cannot_view_target_details";
+   public static final String MSG_WARN_USER_WAS_DELETED = "warn_user_was_deleted"; 
 
    // ------------------------------------------------------------------------------
    // Component implementation
@@ -171,42 +172,51 @@ public class UIAssociationEditor extends BaseAssociationEditor
             out.write("<tr><td>");
             AssociationRef assoc = (AssociationRef)iter.next();
             NodeRef targetNode = assoc.getTargetRef();
-            if (ContentModel.TYPE_PERSON.equals(nodeService.getType(targetNode)))
-            {
-               // if the node represents a person, show the username instead of the name
-               out.write(Utils.encode(User.getFullNameAndUserId(nodeService, targetNode)));
-            }
-            else if (ContentModel.TYPE_AUTHORITY_CONTAINER.equals(nodeService.getType(targetNode)))
-            {
-               // if the node represents a group, show the group display name instead of the name
-               String groupDisplayName = (String)nodeService.getProperty(targetNode, 
-                        ContentModel.PROP_AUTHORITY_DISPLAY_NAME);
-               if (groupDisplayName == null || groupDisplayName.length() == 0)
+            
+            if (nodeService.exists(targetNode))
+            { 
+               if (ContentModel.TYPE_PERSON.equals(nodeService.getType(targetNode)))
                {
-                  String group = (String)nodeService.getProperty(targetNode, 
-                           ContentModel.PROP_AUTHORITY_NAME);
-                  groupDisplayName = group.substring(PermissionService.GROUP_PREFIX.length());
+                  // if the node represents a person, show the username instead of the name
+                  out.write(Utils.encode(User.getFullNameAndUserId(nodeService, targetNode)));
+               }
+               else if (ContentModel.TYPE_AUTHORITY_CONTAINER.equals(nodeService.getType(targetNode)))
+               {
+                  // if the node represents a group, show the group display name instead of the name
+                  String groupDisplayName = (String)nodeService.getProperty(targetNode, 
+                        ContentModel.PROP_AUTHORITY_DISPLAY_NAME);
+                  if (groupDisplayName == null || groupDisplayName.length() == 0)
+                  {
+                     String group = (String)nodeService.getProperty(targetNode, 
+                           ContentModel.PROP_AUTHORITY_NAME);
+                     groupDisplayName = group.substring(PermissionService.GROUP_PREFIX.length());
+                  }
+                  
+                  out.write(groupDisplayName);
+               }
+               else
+               {
+                  // use the standard cm:name property
+                  
+                  // Fix AWC-1301
+                  String displayString = null;
+                  try
+                  {
+                     displayString = Repository.getDisplayPath(nodeService.getPath(targetNode)) + "/" + Repository.getNameForNode(nodeService, targetNode);
+                  }
+                  catch (AccessDeniedException ade)
+                  {
+                     displayString = Application.getMessage(context, MSG_WARN_CANNOT_VIEW_TARGET_DETAILS);
+                  }
+                  
+                  out.write(Utils.encode(displayString));
                }
-               
-               out.write(groupDisplayName);
             }
             else
             {
-               // use the standard cm:name property
-            	
-               // Fix AWC-1301
-               String displayString = null;
-               try
-               {
-            	   displayString = Repository.getDisplayPath(nodeService.getPath(targetNode)) + "/" + Repository.getNameForNode(nodeService, targetNode);
-               }
-               catch (AccessDeniedException ade)
-               {
-            	   displayString = Application.getMessage(context, MSG_WARN_CANNOT_VIEW_TARGET_DETAILS);
-               }
-            
-               out.write(Utils.encode(displayString));
-            }
+               String message = Application.getMessage(context, MSG_WARN_USER_WAS_DELETED);
+               out.write(message);
+            } 
             out.write("</td></tr>");
          }