diff --git a/src/mra.py b/src/mra.py
index 5c7bf8c45ef85a8a9ed89abfd3f14345d3370511..86eb3acbe8f117df73202243951d8d23df3ed5c9 100644
--- a/src/mra.py
+++ b/src/mra.py
@@ -625,9 +625,11 @@ class Workspace(Mapfile):
         else:
             raise AssertionError("Unknown st_type \"%s\"." % st_type)
 
-    def get_store_info(self, st_type, name):
+    def get_store_info(self, st_type, name, exclude=None):
         info = self.get_mra_metadata("%ss" % st_type, {})[name].copy()
         info["name"] = name
+        for k in exclude:
+            info.pop(k)
         return info
 
     def iter_store_names(self, st_type):
@@ -660,7 +662,7 @@ class Workspace(Mapfile):
     def get_datastore_info(self, name):
         """Returns info for a datastore from the workspace."""
 
-        return self.get_store_info("datastore", name)
+        return self.get_store_info("datastore", name, exclude=["password"])
 
     def iter_datastore_names(self):
         """Return an iterator over the datastore names."""