diff --git a/user_webdav.go b/user_webdav.go
index b1fcb61..a70cc5a 100644
--- a/user_webdav.go
+++ b/user_webdav.go
@@ -21,7 +21,7 @@ func cleanWebDAVRoot(root string) string {
 
 func (a *App) initializeUserWebDAVDefaults() error {
 	var users []User
-	if err := a.db.Where("role <> ?", RoleAdmin).Find(&users).Error; err != nil {
+	if err := a.db.Find(&users).Error; err != nil {
 		return err
 	}
 	for _, user := range users {
@@ -127,5 +127,6 @@ func (a *App) storageForTask(t *Task) (RemoteStorage, string, bool) {
 	if a.db.Where("user_id = ?", user.ID).First(&cfg).Error == nil && cfg.RootPath != "" {
 		return a.storage, cfg.RootPath, true
 	}
-	return a.storage, a.cfg.WebDAVPath, true
+	root := cleanWebDAVRoot(strings.TrimRight(a.cfg.WebDAVPath, "/") + "/" + user.Username)
+	return a.storage, root, true
 }