diff --git a/modules/iaas/modules/aws_cloud/includes/aws_cloud_instances_ui.inc b/modules/iaas/modules/aws_cloud/includes/aws_cloud_instances_ui.inc
index fd48993..8f9aa74 100644
--- a/modules/iaas/modules/aws_cloud/includes/aws_cloud_instances_ui.inc
+++ b/modules/iaas/modules/aws_cloud/includes/aws_cloud_instances_ui.inc
@@ -331,6 +331,8 @@ function aws_cloud_console_popup($cloud_context, $instance_id) {
   $key_file_name = bin2hex($result[0]);
   $instance_ip = $result[2];
   $key_material = $result[1];
+  $key_name = $result[0];
+  $private_key = $result[1];
   $ssh_user_name = aws_cloud_get_ssh_user($cloud_context, $instance_id);
   $mind_term_jar = base_path() . AWS_CLOUD_SSH_CLIENT_JAR_FILE;
   $cloud_key_jar = base_path() . drupal_get_path('module', 'cloud') . '/CloudSSHKeyManager.jar';
@@ -349,7 +351,7 @@ EOF;
     
   }
   else {
-    $file_url = url("clouds/$cloud_context/ssh_keys/key_material/$key_name", array('absolute' => TRUE));
+    $file_url = url('clouds/"'.$cloud_context.'"/ssh_keys/key_material/"'.$key_name.'"', array('absolute' => TRUE));
     $browser_cookie = session_name() . '=' . session_id();
     
     $output = <<<EOF