diff --git a/object/application.go b/object/application.go
index 547b7de9..2c464335 100644
--- a/object/application.go
+++ b/object/application.go
@@ -119,7 +119,11 @@ func GetApplicationByOrganizationName(organization string) *Application {
 }
 
 func GetApplicationByUser(user *User) *Application {
-	return GetApplicationByOrganizationName(user.Owner)
+	if user.SignupApplication != "" {
+		return getApplication("admin", user.SignupApplication)
+	} else {
+		return GetApplicationByOrganizationName(user.Owner)
+	}
 }
 
 func GetApplicationByClientId(clientId string) *Application {