diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
index 787ec29ed6..a4e34d0560 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
@@ -127,7 +127,7 @@ public class AuthenticationResource
     if ((user != null) &&!SCMContext.USER_ANONYMOUS.equals(user.getName()))
     {
       state = new ScmState(contextProvider, securityContext,
-                           repositoryManger.getTypes());
+                           repositoryManger.getConfiguredTypes());
     }
     else
     {
@@ -161,7 +161,7 @@ public class AuthenticationResource
     if (user != null)
     {
       ScmState state = new ScmState(contextProvider, securityContext,
-                                    repositoryManger.getTypes());
+                                    repositoryManger.getConfiguredTypes());
 
       resp = Response.ok(state).build();
     }
@@ -199,7 +199,7 @@ public class AuthenticationResource
       }
 
       state = new ScmState(contextProvider, securityContext,
-                           repositoryManger.getTypes());
+                           repositoryManger.getConfiguredTypes());
       response = Response.ok(state).build();
     }
     else
diff --git a/scm-webapp/src/main/java/sonia/scm/group/xml/XmlGroupDatabase.java b/scm-webapp/src/main/java/sonia/scm/group/xml/XmlGroupDatabase.java
index de84c43649..4a11df1bc5 100644
--- a/scm-webapp/src/main/java/sonia/scm/group/xml/XmlGroupDatabase.java
+++ b/scm-webapp/src/main/java/sonia/scm/group/xml/XmlGroupDatabase.java
@@ -59,6 +59,20 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 public class XmlGroupDatabase
 {
 
+  /**
+   * Constructs ...
+   *
+   */
+  public XmlGroupDatabase()
+  {
+    long c = System.currentTimeMillis();
+
+    creationTime = c;
+    lastModified = c;
+  }
+
+  //~--- methods --------------------------------------------------------------
+
   /**
    * Method description
    *
diff --git a/scm-webapp/src/main/java/sonia/scm/group/xml/XmlGroupManager.java b/scm-webapp/src/main/java/sonia/scm/group/xml/XmlGroupManager.java
index 0aa06d4ad5..4ea8dcc211 100644
--- a/scm-webapp/src/main/java/sonia/scm/group/xml/XmlGroupManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/group/xml/XmlGroupManager.java
@@ -209,7 +209,6 @@ public class XmlGroupManager extends AbstractGroupManager
     if (groupDB == null)
     {
       groupDB = new XmlGroupDatabase();
-      groupDB.setCreationTime(System.currentTimeMillis());
     }
   }
 
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java b/scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java
index e7731f9211..8a0e71e1c0 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java
@@ -59,6 +59,20 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 public class XmlRepositoryDatabase
 {
 
+  /**
+   * Constructs ...
+   *
+   */
+  public XmlRepositoryDatabase()
+  {
+    long c = System.currentTimeMillis();
+
+    creationTime = c;
+    lastModified = c;
+  }
+
+  //~--- methods --------------------------------------------------------------
+
   /**
    * Method description
    *
diff --git a/scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java b/scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java
index b159147e50..221d4f4c74 100644
--- a/scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java
+++ b/scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java
@@ -59,6 +59,20 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 public class XmlUserDatabase
 {
 
+  /**
+   * Constructs ...
+   *
+   */
+  public XmlUserDatabase()
+  {
+    long c = System.currentTimeMillis();
+
+    creationTime = c;
+    lastModified = c;
+  }
+
+  //~--- methods --------------------------------------------------------------
+
   /**
    * Method description
    *
diff --git a/scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserManager.java b/scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserManager.java
index 0c28e2c47b..3efe5222c9 100644
--- a/scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserManager.java
@@ -242,7 +242,6 @@ public class XmlUserManager extends AbstractUserManager
     if (userDB == null)
     {
       userDB = new XmlUserDatabase();
-      userDB.setCreationTime(System.currentTimeMillis());
       createDefaultAccounts();
     }
   }