diff --git a/share/etc/oned.conf b/share/etc/oned.conf
index f4795dd358..281951b628 100644
--- a/share/etc/oned.conf
+++ b/share/etc/oned.conf
@@ -961,6 +961,7 @@ HOST_ENCRYPTED_ATTR = "ONE_PASSWORD"
 
 # VM_ENCRYPTED_ATTR = "PACKET_TOKEN
 # VM_ENCRYPTED_ATTR = "PROVISION/PACKET_TOKEN
+VM_ENCRYPTED_ATTR = "CONTEXT/PASSWORD"
 
 # VNET_ENCRYPTED_ATTR = "PROVISION/PACKET_TOKEN
 # VNET_ENCRYPTED_ATTR = "PROVISION/PACKET_TOKEN
diff --git a/src/vm/VirtualMachineContext.cc b/src/vm/VirtualMachineContext.cc
index 4cf63ee728..2b26c8f4e7 100644
--- a/src/vm/VirtualMachineContext.cc
+++ b/src/vm/VirtualMachineContext.cc
@@ -89,6 +89,8 @@ int VirtualMachine::generate_context(string &files, int &disk_id,
         return -1;
     }
 
+    decrypt();
+
     VectorAttribute * context = obj_template->get("CONTEXT");
 
     if ( context == 0 )