diff --git a/source/java/org/alfresco/web/bean/users/EditUserDetailsDialog.java b/source/java/org/alfresco/web/bean/users/EditUserDetailsDialog.java
index 3dbea8e363..821efa5b5b 100644
--- a/source/java/org/alfresco/web/bean/users/EditUserDetailsDialog.java
+++ b/source/java/org/alfresco/web/bean/users/EditUserDetailsDialog.java
@@ -142,7 +142,8 @@ public class EditUserDetailsDialog extends BaseDialogBean
 
     public String getEmail()
     {
-        return person.getProperties().get(ContentModel.PROP_EMAIL).toString();
+        Object value = person.getProperties().get(ContentModel.PROP_EMAIL);
+        return value == null ? null : value.toString();
     }
 
     public void setEmail(String email)
@@ -152,7 +153,8 @@ public class EditUserDetailsDialog extends BaseDialogBean
 
     public String getFirstName()
     {
-        return person.getProperties().get(ContentModel.PROP_FIRSTNAME).toString();
+        Object value = person.getProperties().get(ContentModel.PROP_FIRSTNAME);
+        return value == null ? null : value.toString();
     }
 
     public void setFirstName(String firstName)
@@ -162,7 +164,8 @@ public class EditUserDetailsDialog extends BaseDialogBean
 
     public String getLastName()
     {
-        return person.getProperties().get(ContentModel.PROP_LASTNAME).toString();
+        Object value = person.getProperties().get(ContentModel.PROP_LASTNAME);
+        return value == null ? null : value.toString();
     }
     
     public String getPersonDescription()
diff --git a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java
index 6b07141879..3ed199e25b 100644
--- a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java
+++ b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java
@@ -506,21 +506,11 @@ public class XFormsBean implements Serializable
          LOGGER.debug("inserting node before " + beforeLocation);
       instance.insertNode(fromLocationPath, beforeLocation);
 
-      model.getContainer().dispatch(model.getTarget(), XFormsEventNames.REBUILD, null);
-      model.getContainer().dispatch(model.getTarget(), XFormsEventNames.RECALCULATE, null);
-      model.getContainer().dispatch(model.getTarget(), XFormsEventNames.REVALIDATE, null);
-      model.getContainer().dispatch(model.getTarget(), XFormsEventNames.REFRESH, null);
-
       if (LOGGER.isDebugEnabled())
          LOGGER.debug("deleting from " + from.getLocationPath());
       // need to reload from location path since it has moved
       instance.deleteNode(from.getLocationPath());
 
-      model.getContainer().dispatch(model.getTarget(), XFormsEventNames.REBUILD, null);
-      model.getContainer().dispatch(model.getTarget(), XFormsEventNames.RECALCULATE, null);
-      model.getContainer().dispatch(model.getTarget(), XFormsEventNames.REVALIDATE, null);
-      model.getContainer().dispatch(model.getTarget(), XFormsEventNames.REFRESH, null);
-
       to.getRepeat().setIndex(toPosition);
 
       model.getContainer().dispatch(model.getTarget(), XFormsEventNames.REBUILD, null);