diff --git a/docker/action/entrypoint.sh b/docker/action/entrypoint.sh
index 5f56b82d..2a03cad1 100755
--- a/docker/action/entrypoint.sh
+++ b/docker/action/entrypoint.sh
@@ -11,7 +11,7 @@ if [ ! -f Makefile ]; then
   echo "Cloning i-d-template into lib for default configuration."
   echo "Note: Until setup is complete, the editor's copy will not be updated."
   git clone https://github.com/martinthomson/i-d-template lib
-  echo "PUSH_GHPAGES := false" >Makefile
+  echo "PRE_SETUP := true" >Makefile
   cat lib/template/Makefile >>Makefile
 fi
 
diff --git a/ghpages.mk b/ghpages.mk
index 7338a893..a7885e74 100644
--- a/ghpages.mk
+++ b/ghpages.mk
@@ -27,7 +27,11 @@ endif
 endif
 endif
 
-# Default to pushing if a key or token is available.
+# Disable pushing if we're not setup and for pull requests.
+# Otherwise, enable it if we appear to have credentials.
+ifeq (true,$(PRE_SETUP))
+PUSH_GHPAGES ?= false
+endif
 ifeq (pull_request,$(GITHUB_EVENT_NAME))
 PUSH_GHPAGES ?= false
 endif
diff --git a/main.mk b/main.mk
index f26deb6f..2f95ef43 100644
--- a/main.mk
+++ b/main.mk
@@ -234,10 +234,14 @@ $(TEST_REPORT):
 	echo '</testsuite>' >>$@
 
 .PHONY: lint lint-whitespace lint-default-branch lint-docname
-lint:: lint-whitespace lint-docname
+lint:: lint-whitespace
 ifneq (true,$(CI))
 lint:: lint-default-branch
 endif
+ifeq (true,$(PRE_SETUP))
+# Disable this check for setup.
+lint:: lint-docname
+emdif
 
 lint-whitespace::
 	@err=0; for f in $(drafts_source); do \