diff --git a/make/projects-dir-minimal.mk b/make/projects-dir-minimal.mk
index 00dce372..1443de43 100644
--- a/make/projects-dir-minimal.mk
+++ b/make/projects-dir-minimal.mk
@@ -18,6 +18,13 @@ PROJECTS_MAKEFILE_NAME      := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)
 
 -include local.mk
 
+JWBDIR                      ?= jw-build
+
+ifeq ($(JANWARE_USER),)
+  ifneq ($(wildcard $(JWBDIR)),)
+    JANWARE_USER            := $(shell /usr/bin/python3 $(JWBDIR)/scripts/jw-projects.py -t . get-auth-info --username --only-values)
+  endif
+endif
 ifeq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined)
   ifneq ($(JANWARE_USER),)
     CLONE_FROM_USER          ?= $(JANWARE_USER)
@@ -27,8 +34,7 @@ ifeq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined)
     PROJECTS_DIR_REMOTE_BASE ?= https://janware.com/code
   endif
 endif
-JWBDIR_GIT_REMOTE           ?= $(PROJECTS_DIR_REMOTE_BASE)/$(CLONE_FROM_USER)/jw-build
-JWBDIR                      ?= $(notdir $(JWBDIR_GIT_REMOTE))
+JWBDIR_GIT_REMOTE           ?= $(PROJECTS_DIR_REMOTE_BASE)/$(CLONE_FROM_USER)/$(notdir $(JWBDIR))
 PROJECTS_DIR_INCLUDE_MK      = $(JWBDIR)/make/projects-dir-include.mk
 
 all:
diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index 9c2eeab2..40eb80f9 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -35,7 +35,7 @@ PROJECTS_TXT                ?= projects.txt
 JW_BUILD_VERBOSE            ?= false
 BASE_PKGS                    = git make sudo time xdg-utils python3
 PREREQ_RELEASE              ?= pull
-ifneq ($(origin JANWARE_USER),undefined)
+ifneq ($(JANWARE_USER),)
   export JANWARE_USER
 endif