diff --git a/src/vm/VirtualMachineContext.cc b/src/vm/VirtualMachineContext.cc
index 829aa6880c..605e90246f 100644
--- a/src/vm/VirtualMachineContext.cc
+++ b/src/vm/VirtualMachineContext.cc
@@ -92,8 +92,6 @@ int VirtualMachine::generate_context(string &files, int &disk_id,
         return -1;
     }
 
-    decrypt();
-
     VectorAttribute * context = obj_template->get("CONTEXT");
 
     if ( context == 0 )
@@ -196,6 +194,8 @@ int VirtualMachine::generate_context(string &files, int &disk_id,
         files += (" " + history->token_file);
     }
 
+    decrypt();
+
     const map<string, string>& values = context->value();
 
     file << "# Context variables generated by OpenNebula\n";
@@ -219,6 +219,8 @@ int VirtualMachine::generate_context(string &files, int &disk_id,
 
     context->vector_value("DISK_ID", disk_id);
 
+    encrypt();
+
     return 1;
 }
 
@@ -348,14 +350,14 @@ int VirtualMachine::generate_network_context(VectorAttribute* context,
                 continue;
             }
             else if (get_nic(nic_id)->is_alias()) // If nic was detached and current is alias
-	    {
+            {
                 int parent_id;
 
                 vatts[i]->vector_value("PARENT_ID", parent_id);
 
                 // If parent was detached clear alis
                 if (get_nic(parent_id)->vector_value("ATTACH") == "YES")
-		{
+                {
                     int alias_id;
 
                     vatts[i]->vector_value("ALIAS_ID", alias_id);
diff --git a/src/vm_template/VMTemplatePool.cc b/src/vm_template/VMTemplatePool.cc
index b308b03432..a58451068e 100644
--- a/src/vm_template/VMTemplatePool.cc
+++ b/src/vm_template/VMTemplatePool.cc
@@ -62,6 +62,8 @@ int VMTemplatePool::allocate (
         goto error_duplicated;
     }
 
+    vm_template->encrypt();
+
     // ------------------------------------------------------------------------
     // Insert the Object in the pool
     // ------------------------------------------------------------------------
diff --git a/src/vn_template/VNTemplate.cc b/src/vn_template/VNTemplate.cc
index 69dcf6a578..af81da0602 100644
--- a/src/vn_template/VNTemplate.cc
+++ b/src/vn_template/VNTemplate.cc
@@ -85,6 +85,8 @@ int VNTemplate::insert(SqlDB *db, string& error_str)
         return -1;
     }
 
+    encrypt();
+
     // ------------------------------------------------------------------------
     // Insert the Template
     // ------------------------------------------------------------------------