diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.js
index a95b1acc98..0a30506090 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.js
@@ -19,12 +19,12 @@ function main()
    }
    
    // assign values to the person's properties   
-   person.properties.title = json.get("title");
-   person.properties.firstName = json.get("firstName");
-   person.properties.lastName = json.get("lastName");
-   person.properties.organization = json.get("organisation");
-   person.properties.jobTitle = json.get("jobTitle");
-   person.properties.email = json.get("email");
+   person.properties["title"] = json.get("title");
+   person.properties["firstName"] = json.get("firstName");
+   person.properties["lastName"] = json.get("lastName");
+   person.properties["organization"] = json.get("organisation");
+   person.properties["jobTitle"] = json.get("jobTitle");
+   person.properties["email"] = json.get("email");
    person.save();
    
    // Put the created person into the model
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/person/person.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/person/person.lib.ftl
index 1f5ee2f41c..7041ee0598 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/person/person.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/person/person.lib.ftl
@@ -7,8 +7,16 @@
    <#else>
       "title" : undefined,
    </#if>
-   "firstName" : "${person.properties.firstName}",
-   "lastName" : "${person.properties.lastName}",
+   <#if person.properties.firstName??>
+      "firstName" : "${person.properties.firstName}",
+   <#else>
+      "firstName" : undefined,
+   </#if>
+   <#if person.properties.lastName??>
+      "lastName" : "${person.properties.lastName}",
+   <#else>
+      "lastName" : undefined,
+   </#if>
    <#if person.properties.organization??>
       "organisation" : "${person.properties.organization}",
    <#else>
diff --git a/source/java/org/alfresco/repo/web/scripts/person/PersonServiceTest.java b/source/java/org/alfresco/repo/web/scripts/person/PersonServiceTest.java
index 0e128f3b58..07d0d0326e 100644
--- a/source/java/org/alfresco/repo/web/scripts/person/PersonServiceTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/person/PersonServiceTest.java
@@ -29,16 +29,11 @@ import java.util.List;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
-import org.alfresco.repo.site.SiteModel;
 import org.alfresco.repo.web.scripts.BaseWebScriptTest;
 import org.alfresco.service.cmr.security.AuthenticationService;
 import org.alfresco.service.cmr.security.PersonService;
-import org.alfresco.service.namespace.NamespaceService;
-import org.alfresco.service.namespace.QName;
-import org.alfresco.util.GUID;
 import org.alfresco.util.PropertyMap;
 import org.apache.commons.lang.RandomStringUtils;
-import org.json.JSONArray;
 import org.json.JSONObject;
 import org.springframework.mock.web.MockHttpServletResponse;
 
@@ -94,6 +89,8 @@ public class PersonServiceTest extends BaseWebScriptTest
             personProps.put(ContentModel.PROP_JOBTITLE, "myOrganisation");
             
             this.personService.createPerson(personProps);
+            
+            this.createdPeople.add(userName);
         }        
     }
     
@@ -116,6 +113,11 @@ public class PersonServiceTest extends BaseWebScriptTest
             personService.deletePerson(userName);
         }
         
+        // delete authentications for users created in setUp()
+        this.authenticationService.deleteAuthentication(USER_ONE);
+        this.authenticationService.deleteAuthentication(USER_TWO);
+        this.authenticationService.deleteAuthentication(USER_THREE);
+        
         // Clear the list
         this.createdPeople.clear();
     }