diff --git a/src/ssh.js b/src/ssh.js
index a19d1b8b6..758c4f36b 100644
--- a/src/ssh.js
+++ b/src/ssh.js
@@ -19,7 +19,7 @@ var assert = require('assert'),
     shell = require('./shell.js'),
     util = require('util');
 
-var AUTHORIZED_KEYS_FILEPATH = config.TEST ? path.join(config.baseDir(), 'authorized_keys') : '/root/.ssh/authorized_keys';
+var AUTHORIZED_KEYS_FILEPATH = config.TEST ? path.join(config.baseDir(), 'authorized_keys') : (config.provider() === 'ec2' ? '/home/ubuntu/.ssh/authorized_keys' : '/root/.ssh/authorized_keys');
 var AUTHORIZED_KEYS_TMP_FILEPATH = '/tmp/.authorized_keys';
 var AUTHORIZED_KEYS_CMD = path.join(__dirname, 'scripts/authorized_keys.sh');
 var VALID_KEY_TYPES = ['ssh-rsa'];  // TODO add all supported ones
@@ -72,8 +72,8 @@ function saveKeys(keys) {
         return false;
     }
 
-    // TODO make ec2 work
-    shell.sudoSync('authorized_keys', util.format('%s %s %s %s', AUTHORIZED_KEYS_CMD, config.TEST ? process.env.USER : 'root', AUTHORIZED_KEYS_TMP_FILEPATH, AUTHORIZED_KEYS_FILEPATH));
+    var user = config.TEST ? process.env.USER : (config.provider() === 'ec2' ? 'ubuntu' : 'root');
+    shell.sudoSync('authorized_keys', util.format('%s %s %s %s', AUTHORIZED_KEYS_CMD, user, AUTHORIZED_KEYS_TMP_FILEPATH, AUTHORIZED_KEYS_FILEPATH));
 
     return true;
 }