diff --git a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
index d0043a95ff7..03ce87ad75e 100755
--- a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
+++ b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
@@ -605,7 +605,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
             String root = _parent + "/" + dir;
             mount(root, nfsPath);
 
-            //configCerts(cmd.getCerts());
+            configCerts(cmd.getCerts());
             
             return new SecStorageSetupAnswer(dir);
         } catch (Exception e) {
diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
index 03142a90a27..60dbbd55924 100755
--- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
+++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
@@ -245,9 +245,7 @@ public class DownloadMonitorImpl implements  DownloadMonitor {
         if (srcTmpltHost == null) {
         	throw new InvalidParameterValueException("Template " + template.getName() + " not associated with " + sourceServer.getName());
         }
-        if( !_secMgr.generateSetupCommand(sourceServer.getId()) ){
-            return false;
-        }       
+
         String url = generateCopyUrl(sourceServer, srcTmpltHost);
 	    if (url == null) {
 			s_logger.warn("Unable to start/resume copy of template " + template.getUniqueName() + " to " + destServer.getName() + ", no secondary storage vm in running state in source zone");