diff --git a/api/src/com/cloud/api/response/AccountResponse.java b/api/src/com/cloud/api/response/AccountResponse.java
index aba2974ce72..ae85734d9e0 100755
--- a/api/src/com/cloud/api/response/AccountResponse.java
+++ b/api/src/com/cloud/api/response/AccountResponse.java
@@ -333,7 +333,7 @@ public class AccountResponse extends BaseResponse {
         this.networkDomain = networkDomain;
     }
     
-    public void setDetails(Map details) {
+    public void setDetails(Map<String, String> details) {
     	this.details = details;
     }
     
diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java
index 99bb299b8f2..b4ca6a342cd 100755
--- a/server/src/com/cloud/api/ApiDBUtils.java
+++ b/server/src/com/cloud/api/ApiDBUtils.java
@@ -693,8 +693,9 @@ public class ApiDBUtils {
         return _projectMgr.getProjectOwner(projectId).getId();
     }
     
-    public static Map getAccountDetails(long accountId) {
-    	return _accountDetailsDao.findDetails(accountId);
+    public static Map<String, String> getAccountDetails(long accountId) {
+    	Map<String, String> details = _accountDetailsDao.findDetails(accountId);
+    	return details.isEmpty() ? null : details;
     }
 
     public static Map<String, Set<String>> listNetworkOfferingServices(long networkOfferingId) {