diff --git a/utils/firstuser.in b/utils/firstuser.in
index a9c24577d6670948505e82910bc689b16eff482d..2d6539d611edf22fa11959d81b916cc12ca4873c 100755
--- a/utils/firstuser.in
+++ b/utils/firstuser.in
@@ -14,7 +14,8 @@ use Getopt::Std;
 use lib '@prefix@/lib';
 use libdb;
 
-my $tbadmin = '@TBADMINGROUP@';
+my $tbadmin    = '@TBADMINGROUP@';
+my $ELABINELAB = @ELABINELAB@;
 
 my $wap     = '@prefix@/sbin/withadminprivs';
 my $mkproj  = '@prefix@/sbin/mkproj';
@@ -153,6 +154,14 @@ system "$wap $mkgroup $protoproj $protoproj";
 print "Running mkacct...\n";
 system "$wap $mkacct $protouser";
 
+#
+# Okay, if not ELABINELAB, then set the firstinitstate so that the web
+# interface will take the user through his first project setup.
+#
+if (!$ELABINELAB) {
+    TBSetSiteVar("general/firstinit/state", "createproject");
+}
+
 print "User created. Once the web page is up, you should be able to log in\n";
 print "as '$protouser' with the password you just entered. Refer to\n";
 print "setup-db.txt for instructions on creating a 'real' user account for\n";