diff --git a/circle/dashboard/templates/dashboard/vm-detail.html b/circle/dashboard/templates/dashboard/vm-detail.html
index 4918ad6..fc3a6d7 100644
--- a/circle/dashboard/templates/dashboard/vm-detail.html
+++ b/circle/dashboard/templates/dashboard/vm-detail.html
@@ -122,10 +122,10 @@
         </span>
       </div>
       <div id="dashboard-vm-details-connect">
-        <form method="POST" action="{{ instance.access_method}}:cloud:{{ instance.pw }}:{% if instance.get_connect_port %}{{ instance.get_connect_host }}:{{ instance.get_connect_port }}{% endif %}" target="_blank">
-	    <button id="dashboard-vm-details-connect-button" type="submit" class="btn btn-xs btn-default" {% if instance.status != "RUNNING" %}disabled{% endif %} title="{% trans "Connect via the CIRCLE Client" %}">
+        <form method="POST" action="{% if instance.get_connect_uri %}{{ instance.get_connect_uri}}{% endif %}" target="_blank">
+	    <button id="dashboard-vm-details-connect-button" type="submit" class="btn btn-xs btn-default" {% if instance.status != "RUNNING" or not instance.get_connect_uri %}disabled{% endif %} title="{% trans "Connect via the CIRCLE Client" %}">
     		<i class="fa fa-external-link"></i> {% trans "Connect" %}
-    	    </button>
+    	</button>
 	</form>
       </div>
     </div>