diff --git a/manual_content_scan.c b/manual_content_scan.c
index 43c3f96e61..e381344533 100644
--- a/manual_content_scan.c
+++ b/manual_content_scan.c
@@ -923,7 +923,6 @@ bool manual_content_scan_get_task_config(
       manual_content_scan_task_config_t *task_config,
       const char *path_dir_playlist)
 {
-   size_t _len;
    if (!task_config)
       return false;
 
@@ -983,13 +982,11 @@ bool manual_content_scan_get_task_config(
 
    /* Now we have a valid system name, can generate
     * a 'database' name... */
-   _len = strlcpy(
+   fill_pathname(
          task_config->database_name,
          task_config->system_name,
-         sizeof(task_config->database_name));
-   strlcpy(task_config->database_name       + _len,
          ".lpl",
-         sizeof(task_config->database_name) - _len);
+         sizeof(task_config->database_name));
 
    /* ...which can in turn be used to generate the
     * playlist path */