killbill-aplcache

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountJson.java
index cc06065..91763c0 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountJson.java
@@ -28,13 +28,10 @@ import org.joda.time.DateTimeZone;
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.account.api.AccountData;
 import org.killbill.billing.catalog.api.Currency;
-import org.killbill.billing.util.UUIDs;
 import org.killbill.billing.util.audit.AccountAuditLogs;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
 import com.google.common.base.Strings;
 import com.wordnik.swagger.annotations.ApiModelProperty;
 
@@ -119,9 +116,9 @@ public class AccountJson extends JsonBase {
         this.accountBalance = accountBalance;
         this.externalKey = externalKey;
         this.accountId = accountId;
-        this.name = MoreObjects.firstNonNull(name, UUIDs.randomUUID().toString());
-        this.firstNameLength = MoreObjects.firstNonNull(firstNameLength, this.name.length());
-        this.email = MoreObjects.firstNonNull(email, "");
+        this.name = name;
+        this.firstNameLength = firstNameLength;
+        this.email = email;
         this.billCycleDayLocal = billCycleDayLocal;
         this.currency = currency;
         this.paymentMethodId = paymentMethodId;
@@ -136,7 +133,7 @@ public class AccountJson extends JsonBase {
         this.locale = locale;
         this.phone = phone;
         this.isMigrated = isMigrated;
-        this.isNotifiedForInvoices = isNotifiedForInvoices != null ? isNotifiedForInvoices : false;
+        this.isNotifiedForInvoices = isNotifiedForInvoices;
         this.accountCBA = accountCBA;
     }
 

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAccount.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAccount.java
index 0d20588..60072e8 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAccount.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAccount.java
@@ -55,8 +55,8 @@ public class TestAccount extends TestJaxrsBase {
 
         final Account account = killBillClient.createAccount(emptyAccount, createdBy, reason, comment);
         Assert.assertNotNull(account.getExternalKey());
-        Assert.assertNotNull(account.getName());
-        Assert.assertNotNull(account.getEmail());
+        Assert.assertNull(account.getName());
+        Assert.assertNull(account.getEmail());
     }
 
     @Test(groups = "slow", description = "Verify external key is unique")