diff --git a/developer/developer-prefill.sql b/developer/developer-prefill.sql
index cba5382f3e2..8e215ba77d9 100644
--- a/developer/developer-prefill.sql
+++ b/developer/developer-prefill.sql
@@ -44,4 +44,9 @@ INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
             VALUES ('Advanced', 'DEFAULT', 'management-server',
             'integration.api.port', '8096');
 
+-- Add developer configuration entry; allows management server to be run as a user other than "cloud"
+INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
+            VALUES ('Advanced', 'DEFAULT', 'management-server',
+            'developer', 'true');
+
 commit;
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 904e8c59f6e..420b1722e0f 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -570,6 +570,7 @@ public class ConfigurationServerImpl implements ConfigurationServer {
         String username = System.getProperty("user.name");
         Boolean devel = Boolean.valueOf(_configDao.getValue("developer"));
         if (!username.equalsIgnoreCase("cloud") && !devel) {
+            s_logger.warn("Systemvm keypairs could not be set. Management server should be run as cloud user, or in development mode.");
             return;
         }
         String already = _configDao.getValue("ssh.privatekey");