From 9b2a3d23b2f72411c89b522f8a23abdcfbe86782 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Thu, 17 Sep 2020 13:56:04 -0700
Subject: [PATCH] cloudron-setup: there could be owners who have not selected a
 username yet

---
 scripts/cloudron-support | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/cloudron-support b/scripts/cloudron-support
index 18ae7fefa..7ffca3db6 100755
--- a/scripts/cloudron-support
+++ b/scripts/cloudron-support
@@ -37,7 +37,7 @@ while true; do
         # fall through
         ;&
     --owner-login)
-        admin_username=$(mysql -NB -uroot -ppassword -e "SELECT username FROM box.users WHERE role='owner' LIMIT 1" 2>/dev/null)
+        admin_username=$(mysql -NB -uroot -ppassword -e "SELECT username FROM box.users WHERE role='owner' AND username IS NOT NULL ORDER BY createdAt LIMIT 1" 2>/dev/null)
         admin_password=$(pwgen -1s 12)
         ghost_file=/home/yellowtent/platformdata/cloudron_ghost.json
         printf '{"%s":"%s"}\n' "${admin_username}" "${admin_password}" > "${ghost_file}"