diff --git a/config/urlfilter/makeconf.pl b/config/urlfilter/makeconf.pl
index 914461167..b1baf0153 100644
--- a/config/urlfilter/makeconf.pl
+++ b/config/urlfilter/makeconf.pl
@@ -36,10 +36,6 @@ print FILE "}\n";
 close FILE;
 print "\n";
 
-print "Building blacklist databases ";
-system("$swroot/urlfilter/bin/prebuild.pl");
-print "\n";
-
 print "Creating custom directories ";
 mkdir("$dbdir/custom");
 mkdir("$dbdir/custom/allowed");
@@ -50,4 +46,8 @@ system("touch $dbdir/custom/blocked/domains");
 system("touch $dbdir/custom/blocked/urls");
 print "\n";
 
+print "Building blacklist databases ";
+system("$swroot/urlfilter/bin/prebuild.pl");
+print "\n";
+
 exit
diff --git a/config/urlfilter/prebuild.pl b/config/urlfilter/prebuild.pl
index 94138e1ef..d58d135d6 100644
--- a/config/urlfilter/prebuild.pl
+++ b/config/urlfilter/prebuild.pl
@@ -9,11 +9,6 @@ $dbdir="/var/ipfire/urlfilter/blacklists";
 
 system("/usr/bin/squidGuard -C all");
 
-if (-e "$dbdir/custom/allowed/domains.db") { unlink("$dbdir/custom/allowed/domains.db"); }
-if (-e "$dbdir/custom/allowed/urls.db")    { unlink("$dbdir/custom/allowed/urls.db"); }
-if (-e "$dbdir/custom/blocked/domains.db") { unlink("$dbdir/custom/blocked/domains.db"); }
-if (-e "$dbdir/custom/blocked/urls.db")    { unlink("$dbdir/custom/blocked/urls.db"); }
-
 system("chown -R nobody.nobody $dbdir");
 
 &setpermissions ($dbdir);
diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index 23410835d..5713cd55b 100644
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -353,15 +353,6 @@ if (($filtersettings{'ACTION'} eq $Lang::tr{'save'}) ||
               	$filtersettings{'VALID'} = 'yes';
 		&savesettings;
 
-		system("chown -R nobody.nobody $dbdir");
-
-		if (-e "$dbdir/custom/allowed/domains.db") { unlink("$dbdir/custom/allowed/domains.db"); }
-		if (-e "$dbdir/custom/allowed/urls.db")    { unlink("$dbdir/custom/allowed/urls.db"); }
-		if (-e "$dbdir/custom/blocked/domains.db") { unlink("$dbdir/custom/blocked/domains.db"); }
-		if (-e "$dbdir/custom/blocked/urls.db")    { unlink("$dbdir/custom/blocked/urls.db"); }
-
-		&setpermissions ($dbdir);
-
 		system('/usr/local/bin/squidctrl restart >/dev/null 2>&1');
 	}
 }
@@ -2542,6 +2533,13 @@ sub savesettings
 	delete $filtersettings{'BACKGROUND'};
 	delete $filtersettings{'UPDATEFILE'};
 
+	system("chown -R nobody.nobody $dbdir");
+	system('/usr/bin/squidGuard -C custom/allowed/domains >/dev/null 2>&1');
+	system('/usr/bin/squidGuard -C custom/allowed/urls >/dev/null 2>&1');
+	system('/usr/bin/squidGuard -C custom/blocked/domains >/dev/null 2>&1');
+	system('/usr/bin/squidGuard -C custom/blocked/urls >/dev/null 2>&1 ');
+	&setpermissions ($dbdir);
+
 	&General::writehash("${General::swroot}/urlfilter/settings", \%filtersettings);
 }