diff --git a/appview/config/config.go b/appview/config/config.go
--- a/appview/config/config.go
+++ b/appview/config/config.go
@@ -13,7 +13,8 @@
 	CookieSecret            string `env:"COOKIE_SECRET, default=00000000000000000000000000000000"`
 	DbPath                  string `env:"DB_PATH, default=appview.db"`
 	ListenAddr              string `env:"LISTEN_ADDR, default=0.0.0.0:3000"`
-	AppviewHost             string `env:"APPVIEW_HOST, default=https://tangled.sh"`
+	AppviewHost             string `env:"APPVIEW_HOST, default=https://tangled.org"`
+	AppviewName             string `env:"APPVIEW_Name, default=Tangled"`
 	Dev                     bool   `env:"DEV, default=false"`
 	DisallowedNicknamesFile string `env:"DISALLOWED_NICKNAMES_FILE"`
 
diff --git a/appview/oauth/handler.go b/appview/oauth/handler.go
--- a/appview/oauth/handler.go
+++ b/appview/oauth/handler.go
@@ -31,6 +31,8 @@
 func (o *OAuth) clientMetadata(w http.ResponseWriter, r *http.Request) {
 	doc := o.ClientApp.Config.ClientMetadata()
 	doc.JWKSURI = &o.JwksUri
+	doc.ClientName = &o.ClientName
+	doc.ClientURI = &o.ClientUri
 
 	w.Header().Set("Content-Type", "application/json")
 	if err := json.NewEncoder(w).Encode(doc); err != nil {
diff --git a/appview/oauth/oauth.go b/appview/oauth/oauth.go
--- a/appview/oauth/oauth.go
+++ b/appview/oauth/oauth.go
@@ -26,6 +26,8 @@
 	SessStore  *sessions.CookieStore
 	Config     *config.Config
 	JwksUri    string
+	ClientName string
+	ClientUri  string
 	Posthog    posthog.Client
 	Db         *db.DB
 	Enforcer   *rbac.Enforcer
@@ -34,10 +36,8 @@
 }
 
 func New(config *config.Config, ph posthog.Client, db *db.DB, enforcer *rbac.Enforcer, res *idresolver.Resolver, logger *slog.Logger) (*OAuth, error) {
-
 	var oauthConfig oauth.ClientConfig
 	var clientUri string
-
 	if config.Core.Dev {
 		clientUri = "http://127.0.0.1:3000"
 		callbackUri := clientUri + "/oauth/callback"
@@ -70,11 +70,15 @@
 	clientApp := oauth.NewClientApp(&oauthConfig, authStore)
 	clientApp.Dir = res.Directory()
 
+	clientName := config.Core.AppviewName
+
 	return &OAuth{
 		ClientApp:  clientApp,
 		Config:     config,
 		SessStore:  sessStore,
 		JwksUri:    jwksUri,
+		ClientName: clientName,
+		ClientUri:  clientUri,
 		Posthog:    ph,
 		Db:         db,
 		Enforcer:   enforcer,