diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index e55017ce5ea..27e0c2fc3cf 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -260,7 +260,7 @@ migrateVolume=com.cloud.api.commands.MigrateVolumeCmd;15
 ####                                 use that key...the key is stored in the db associated w/
 ####                                 the userId...every request to the developer API should be
 ####                                 checked against the key
-registerUserKeys=com.cloud.api.commands.RegisterCmd;1
+registerUserKeys=com.cloud.api.commands.RegisterCmd;15
 
 ### async-query command
 queryAsyncJobResult=com.cloud.api.commands.QueryAsyncJobResultCmd;15
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index ba741a4f063..de8149fe877 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -1282,6 +1282,7 @@
     } else {
         if(isSelfOrChildDomainUser(jsonObj.username, jsonObj.accounttype, jsonObj.domainid, jsonObj.iscallerchilddomain)) {
             allowedActions.push("changePassword");
+            allowedActions.push("generateKeys");
         }
     }
     return allowedActions;