--- a/debian/littlebird-tc-sql.config	Wed Aug 31 17:20:19 2011 +0200
+++ b/debian/littlebird-tc-sql.config	Thu Sep 01 12:23:59 2011 +0200
@@ -1,4 +1,5 @@
 #! /bin/sh
+echo "$0: $@" >&2
 set -e
 . /usr/share/debconf/confmodule
 db_version 2.0
@@ -9,22 +10,20 @@
 
 
 if test "$1" = "clear"; then
-    for key in db/adminuser db/adminpass
+    for key in db/have-admin db/adminuser db/adminpass
     do db_reset $prefix/$key; done
 fi
 
 db_settitle $prefix-sql/TITLE
-db_beginblock
-	db_input medium   $prefix/db/adminuser || true
-	db_input critical $prefix/db/adminpass || true
-db_endblock
-
+db_input critical $prefix/db/have-admin     || true
 db_go || true
 
-db_get $prefix/db/adminpass || true
-if test -z "$RET" ; then
-    db_fset $prefix/db/noadminpass seen false
-    db_input critical $prefix/db/noadminpass || true
-    db_go || true
-    exit 1
+db_get $prefix/db/have-admin
+if test "$RET" = "true"; then
+    db_beginblock
+	db_input medium   $prefix/db/adminuser || true
+	db_input critical $prefix/db/adminpass || true
+    db_endblock
 fi
+
+db_go || true