diff --git a/src/cli/onecluster b/src/cli/onecluster
index 3360edaab3..2604311a14 100755
--- a/src/cli/onecluster
+++ b/src/cli/onecluster
@@ -116,7 +116,8 @@ CommandParser::CmdParser.new(ARGV) do
         Shows information for the given Cluster
     EOT
 
-    command :show, show_desc, :clusterid, :options => OpenNebulaHelper::XML do
+    command :show, show_desc, :clusterid,
+            :options => [OpenNebulaHelper::XML, OpenNebulaHelper::DECRYPT] do
         helper.show_resource(args[0], options)
     end
 
diff --git a/src/cli/onedatastore b/src/cli/onedatastore
index 828501d5f4..7f0af3130b 100755
--- a/src/cli/onedatastore
+++ b/src/cli/onedatastore
@@ -158,7 +158,8 @@ CommandParser::CmdParser.new(ARGV) do
         Shows information for the given Datastore
     EOT
 
-    command :show, show_desc, :datastoreid, :options => OpenNebulaHelper::XML do
+    command :show, show_desc, :datastoreid,
+            :options => [OpenNebulaHelper::XML, OpenNebulaHelper::DECRYPT] do
         helper.show_resource(args[0], options)
     end
 
diff --git a/src/datastore/Datastore.cc b/src/datastore/Datastore.cc
index 0d9a9bbc63..05edd2f003 100644
--- a/src/datastore/Datastore.cc
+++ b/src/datastore/Datastore.cc
@@ -641,6 +641,9 @@ int Datastore::insert(SqlDB *db, string& error_str)
         replace_template_attribute("RESTRICTED_DIRS", "/");
     }
 
+    // Encrypt all the secrets
+    encrypt();
+
     //--------------------------------------------------------------------------
     // Insert the Datastore
     //--------------------------------------------------------------------------