diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js
index 151134c2703..9bb7f21976b 100644
--- a/ui/scripts/cloud.core.iso.js
+++ b/ui/scripts/cloud.core.iso.js
@@ -341,7 +341,7 @@ function isoJsonToDetailsTab() {
 	*/
     
 	// "Download ISO", "Delete ISO"
-	if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) || (jsonObj.isready == false && jsonObj.isostatus != null && jsonObj.isostatus.indexOf("% Downloaded") != -1)) {
+	if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) || (jsonObj.isready == false)) {
 	    //do nothing
 	}
 	else {	    
diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js
index d70067ed541..15ec79757ef 100644
--- a/ui/scripts/cloud.core.template.js
+++ b/ui/scripts/cloud.core.template.js
@@ -336,7 +336,7 @@ function templateJsonToDetailsTab() {
 	
 	// "Download Template", "Delete Template"	
 	if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) 
-		|| (jsonObj.isready == false && jsonObj.templatestatus != null && jsonObj.templatestatus.indexOf("% Downloaded") != -1) || jsonObj.templatetype == "SYSTEM") {
+		|| (jsonObj.isready == false) || jsonObj.templatetype == "SYSTEM") {
 	    //do nothing	
     }
     else {