diff --git a/src/sunstone/public/app/tabs/vms-tab/datatable.js b/src/sunstone/public/app/tabs/vms-tab/datatable.js
index b30823c420..4db77357ed 100644
--- a/src/sunstone/public/app/tabs/vms-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/vms-tab/datatable.js
@@ -284,8 +284,8 @@ define(function(require) {
           : Notifier.notifyError(Locale.tr("VNC - Invalid action"));
       }
 
-      var remote_connections = function(){
-        if (FireedgeValidator.fireedgeToken != ""){
+      var remote_connections = function(fireedgeToken){
+        if (fireedgeToken != ""){
           var data = $(that).data();
           // Get VM info
           if (data.hasOwnProperty('id')){
@@ -304,11 +304,11 @@ define(function(require) {
         }
       }
 
-      if (fireedgeToken == "") {
+      if (FireedgeValidator.fireedgeToken == "") {
         FireedgeValidator.validateFireedgeToken(remote_connections, callVNC);
       }
       else{
-        remote_connections();
+        remote_connections(FireedgeValidator.fireedgeToken);
       }
 
       return false;
diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/info.js b/src/sunstone/public/app/tabs/vms-tab/panels/info.js
index e069f2ecd0..8d66c65312 100644
--- a/src/sunstone/public/app/tabs/vms-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/vms-tab/panels/info.js
@@ -176,7 +176,7 @@ define(function(require) {
     TemplateTableVcenter.setup(strippedTemplateVcenter, RESOURCE, this.element.ID, context, unshownValues, strippedTemplate);
 
     var show_buttons = function(){
-      if (FireedgeValidator.fireedgeToken != ""){
+      if (fireedge_token != ""){
         $(".vnc-button").hide();
         if(that && that.element && that.element.USER_TEMPLATE && that.element.USER_TEMPLATE.HYPERVISOR){
           if (that.element.USER_TEMPLATE.HYPERVISOR == "vcenter"){
@@ -188,10 +188,13 @@ define(function(require) {
             $(".vmrc-button").hide();
           }
         }
+        else{
+          $(".guac-button").show();
+          $(".vmrc-button").hide();
+        }
       }
       else{
         $(".vnc-button").show();
-        // Verify hipervisor
         $(".guac-button").hide();
         $(".vmrc-button").hide();
       }