3 files changed, 39 insertions, 11 deletions

diff --git a/docs/admin/cli.md b/docs/admin/cli.md
index c7d67292f..5029f25c2 100644
--- a/docs/admin/cli.md
+++ b/docs/admin/cli.md
@@ -57,6 +57,9 @@ Contains `account`, `export`, `import`, and `media` subcommands.
 
 This command can be used to create a new account on your instance.
 
+!!! Warning
+    You must have launched the server at least once before running this command, to initialize essential entries in the database.
+
 `gotosocial admin account create --help`:
 
 ```text
diff --git a/internal/db/bundb/admin.go b/internal/db/bundb/admin.go
index 9f5ccad01..0666cf8a8 100644
--- a/internal/db/bundb/admin.go
+++ b/internal/db/bundb/admin.go
@@ -165,15 +165,11 @@ func (a *adminDB) NewSignup(ctx context.Context, newSignup gtsmodel.NewSignup) (
 		return nil, err
 	}
 
-	defer func() {
-		// Pin account to (new)
-		// user before returning.
-		user.Account = account
-	}()
-
+	// If there's already a
+	// user for this account,
+	// just pin acct + return.
 	if user != nil {
-		// Already had a user for this
-		// account, just return that.
+		user.Account = account
 		return user, nil
 	}
 
@@ -194,13 +190,21 @@ func (a *adminDB) NewSignup(ctx context.Context, newSignup gtsmodel.NewSignup) (
 	}
 
 	// If no app ID was set,
-	// use the instance app ID.
+	// get the instance app
+	// and use its ID.
 	if newSignup.AppID == "" {
 		instanceApp, err := a.state.DB.GetInstanceApplication(ctx)
-		if err != nil {
+		if err != nil && !errors.Is(err, db.ErrNoEntries) {
 			err := gtserror.Newf("db error getting instance app: %w", err)
 			return nil, err
 		}
+
+		if instanceApp == nil {
+			const errText = "instance application not yet created, run the server at least once *before* creating users"
+			err := gtserror.New(errText)
+			return nil, err
+		}
+
 		newSignup.AppID = instanceApp.ID
 	}
 
diff --git a/internal/db/bundb/admin_test.go b/internal/db/bundb/admin_test.go
index 0ac3cc073..247431e87 100644
--- a/internal/db/bundb/admin_test.go
+++ b/internal/db/bundb/admin_test.go
@@ -21,7 +21,7 @@ import (
 	"context"
 	"testing"
 
-	gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20211113114307_init"
+	"code.superseriousbusiness.org/gotosocial/internal/gtsmodel"
 	"code.superseriousbusiness.org/gotosocial/testrig"
 	"github.com/stretchr/testify/suite"
 )
@@ -92,6 +92,27 @@ func (suite *AdminTestSuite) TestCreateInstanceAccount() {
 	suite.NotNil(acct)
 }
 
+func (suite *AdminTestSuite) TestNewSignupWithNoInstanceApp() {
+	ctx := context.Background()
+
+	// Delete the instance app.
+	if err := suite.state.DB.DeleteApplicationByID(
+		ctx,
+		suite.testApplications["instance_application"].ID,
+	); err != nil {
+		suite.FailNow(err.Error())
+	}
+
+	// Try to create a new signup with no provided app ID,
+	// it should fail as it can't fetch the instance app.
+	_, err := suite.state.DB.NewSignup(ctx, gtsmodel.NewSignup{
+		Username: "whatever",
+		Email:    "whatever@wherever.org",
+		Password: "really_good_password",
+	})
+	suite.EqualError(err, "NewSignup: instance application not yet created, run the server at least once *before* creating users")
+}
+
 func TestAdminTestSuite(t *testing.T) {
 	suite.Run(t, new(AdminTestSuite))
 }