diff --git a/source/java/org/alfresco/repo/jscript/People.java b/source/java/org/alfresco/repo/jscript/People.java
index 088b701d88..cf84894842 100644
--- a/source/java/org/alfresco/repo/jscript/People.java
+++ b/source/java/org/alfresco/repo/jscript/People.java
@@ -966,7 +966,7 @@ public class People extends BaseScopableProcessorExtension implements Initializi
     {
     	NodeRef personRef = null;
 
-        ParameterCheck.mandatoryString("Username", username);
+        ParameterCheck.mandatory("Username", username);
         try
         {
 	        personRef = personService.getPersonOrNull(username);
diff --git a/source/java/org/alfresco/repo/jscript/app/UsernamePropertyDecorator.java b/source/java/org/alfresco/repo/jscript/app/UsernamePropertyDecorator.java
index 9692ec3ab0..5956168f82 100644
--- a/source/java/org/alfresco/repo/jscript/app/UsernamePropertyDecorator.java
+++ b/source/java/org/alfresco/repo/jscript/app/UsernamePropertyDecorator.java
@@ -60,7 +60,12 @@ public class UsernamePropertyDecorator extends BasePropertyDecorator
         // DO NOT change this to just use getPersonOrNullImpl
         //  - there is Cloud THOR prod hack see personServiceImpl.personExists
         //  - and THOR-293 
-        if (this.personService.personExists(username))
+        if (username.isEmpty())
+        {
+            firstName = "";
+            lastName = "";
+        }
+        else if (this.personService.personExists(username))
         {
             NodeRef personRef = this.personService.getPerson(username, false);
             firstName = (String)this.nodeService.getProperty(personRef, ContentModel.PROP_FIRSTNAME);
diff --git a/source/test-java/org/alfresco/repo/node/integrity/IntegrityTest.java b/source/test-java/org/alfresco/repo/node/integrity/IntegrityTest.java
index 100de7ab3a..00065bd8fc 100644
--- a/source/test-java/org/alfresco/repo/node/integrity/IntegrityTest.java
+++ b/source/test-java/org/alfresco/repo/node/integrity/IntegrityTest.java
@@ -245,6 +245,13 @@ public class IntegrityTest extends TestCase
         checkIntegrityNoFailure();
     }
     
+    public void testCreateWithEmptyMandatoryProperty() throws Exception
+    {
+        allProperties.put(TEST_PROP_TEXT_A, "");
+        NodeRef nodeRef = createNode("abc", TEST_TYPE_WITH_PROPERTIES, allProperties);
+        checkIntegrityNoFailure();
+    }
+    
     public void testMandatoryPropertiesRemoved() throws Exception
     {
         NodeRef nodeRef = createNode("abc", TEST_TYPE_WITH_PROPERTIES, allProperties);