diff --git a/api/src/com/cloud/api/ResponseGenerator.java b/api/src/com/cloud/api/ResponseGenerator.java
index d02fd1bd8b0..a2ef2b39587 100644
--- a/api/src/com/cloud/api/ResponseGenerator.java
+++ b/api/src/com/cloud/api/ResponseGenerator.java
@@ -207,6 +207,6 @@ public interface ResponseGenerator {
 
 	UserResponse createUserResponse(User user);
 
-	UserResponse createUserAccountResponse(UserAccount user);
+	AccountResponse createUserAccountResponse(UserAccount user);
 
 }
diff --git a/api/src/com/cloud/api/commands/CreateAccountCmd.java b/api/src/com/cloud/api/commands/CreateAccountCmd.java
index 881e303f94c..84dfd02a4ac 100644
--- a/api/src/com/cloud/api/commands/CreateAccountCmd.java
+++ b/api/src/com/cloud/api/commands/CreateAccountCmd.java
@@ -25,6 +25,7 @@ import com.cloud.api.BaseCmd;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
 import com.cloud.api.ServerApiException;
+import com.cloud.api.response.AccountResponse;
 import com.cloud.api.response.UserResponse;
 import com.cloud.user.UserAccount;
 
@@ -125,7 +126,7 @@ public class CreateAccountCmd extends BaseCmd {
     public void execute(){
         UserAccount user = _accountService.createAccount(this);
         if (user != null) {
-            UserResponse response = _responseGenerator.createUserAccountResponse(user);
+            AccountResponse response = _responseGenerator.createUserAccountResponse(user);
             response.setResponseName(getCommandName());
             this.setResponseObject(response);
         } else {
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index f9f77d817b5..875d647e240 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -7,7 +7,7 @@ deleteAccount=com.cloud.api.commands.DeleteAccountCmd;1
 updateAccount=com.cloud.api.commands.UpdateAccountCmd;3
 disableAccount=com.cloud.api.commands.DisableAccountCmd;3
 enableAccount=com.cloud.api.commands.EnableAccountCmd;3
-lockAccount=com.cloud.api.commands.LockAccountCmd;3
+###lockAccount=com.cloud.api.commands.LockAccountCmd;3
 listAccounts=com.cloud.api.commands.ListAccountsCmd;15
 
 #### User commands
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 23c58a1b852..b2ace211b76 100644
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -203,28 +203,10 @@ public class ApiResponseHelper implements ResponseGenerator {
 
         return userResponse;
     }
-
     //this method is used for response generation via createAccount (which creates an account + user)
     @Override
-    public UserResponse createUserAccountResponse(UserAccount user) {
-        UserResponse userResponse = new UserResponse();
-        userResponse.setAccountName(user.getAccountName());
-        userResponse.setAccountType(user.getType());
-        userResponse.setCreated(user.getCreated());
-        userResponse.setDomainId(user.getDomainId());
-        userResponse.setDomainName(ApiDBUtils.findDomainById(user.getDomainId()).getName());
-        userResponse.setEmail(user.getEmail());
-        userResponse.setFirstname(user.getFirstname());
-        userResponse.setId(user.getId());
-        userResponse.setLastname(user.getLastname());
-        userResponse.setState(user.getState());
-        userResponse.setTimezone(user.getTimezone());
-        userResponse.setUsername(user.getUsername());
-        userResponse.setApiKey(user.getApiKey());
-        userResponse.setSecretKey(user.getSecretKey());
-        userResponse.setObjectName("account");
-
-        return userResponse;
+    public AccountResponse createUserAccountResponse(UserAccount user) {
+    	return createAccountResponse(ApiDBUtils.findAccountById(user.getAccountId()));
     }