diff --git a/assets/templates/oauth_clients_limit_exceeded.html b/assets/templates/oauth_clients_limit_exceeded.html
index 3b9c553e12c..6d10958175d 100644
--- a/assets/templates/oauth_clients_limit_exceeded.html
+++ b/assets/templates/oauth_clients_limit_exceeded.html
@@ -26,14 +26,14 @@ <h1 class="h4 h2-md mb-4 text-center">{{t "Too Many OAuth Clients Title" .Client
               {{t "Too Many OAuth Clients Available Actions"}}
             </p>
             {{if .PremiumURL}}
-            <a href="{{.PremiumURL}}" target="_blank" class="btn btn-primary btn-md-lg w-100 mb-2">
+            <a href="{{.PremiumURL}}" {{with .OpenLinksInNewTab}}target="_blank"{{end}} class="btn btn-primary btn-md-lg w-100 mb-2">
               {{t "Too Many OAuth Clients Offers Btn"}}
             </a>
-            <a href="{{.ManageDevicesURL}}" target="_blank" class="btn btn-outline-info btn-md-lg w-100">
+            <a href="{{.ManageDevicesURL}}" {{with .OpenLinksInNewTab}}target="_blank"{{end}} class="btn btn-outline-info btn-md-lg w-100">
               {{t "Too Many OAuth Clients Settings Btn"}}
             </a>
             {{else}}
-            <a href="{{.ManageDevicesURL}}" target="_blank" class="btn btn-primary btn-md-lg w-100">
+            <a href="{{.ManageDevicesURL}}" {{with .OpenLinksInNewTab}}target="_blank"{{end}} class="btn btn-primary btn-md-lg w-100">
               {{t "Too Many OAuth Clients Settings Btn"}}
             </a>
             {{end}}
diff --git a/web/auth/oauth.go b/web/auth/oauth.go
index f3296896d04..1a34e13f61f 100644
--- a/web/auth/oauth.go
+++ b/web/auth/oauth.go
@@ -271,16 +271,17 @@ func (a *AuthorizeHTTPHandler) authorizeForm(c echo.Context) error {
 				settingsToken := inst.BuildAppToken(consts.SettingsSlug, sess.ID())
 
 				return c.Render(http.StatusOK, "oauth_clients_limit_exceeded.html", echo.Map{
-					"Domain":           inst.ContextualDomain(),
-					"ContextName":      inst.ContextName,
-					"Locale":           inst.Locale,
-					"Title":            inst.TemplateTitle(),
-					"Favicon":          middlewares.Favicon(inst),
-					"ClientsCount":     strconv.Itoa(count),
-					"ClientsLimit":     strconv.Itoa(limit),
-					"ManageDevicesURL": manageDevicesURL,
-					"PremiumURL":       premiumURL,
-					"SettingsToken":    settingsToken,
+					"Domain":            inst.ContextualDomain(),
+					"ContextName":       inst.ContextName,
+					"Locale":            inst.Locale,
+					"Title":             inst.TemplateTitle(),
+					"Favicon":           middlewares.Favicon(inst),
+					"ClientsCount":      strconv.Itoa(count),
+					"ClientsLimit":      strconv.Itoa(limit),
+					"OpenLinksInNewTab": true,
+					"ManageDevicesURL":  manageDevicesURL,
+					"PremiumURL":        premiumURL,
+					"SettingsToken":     settingsToken,
 				})
 			}
 		}
diff --git a/web/statik/statik.go b/web/statik/statik.go
index dbc35a58d61..9b8b055eb4e 100644
--- a/web/statik/statik.go
+++ b/web/statik/statik.go
@@ -39326,22 +39326,22 @@ GoDsDGV0jNpap3f29ea2dEQRuD4bVrToq+7EUHYE
 -----END COZY ASSET-----
 -----BEGIN COZY ASSET-----
 Name: /templates/oauth_clients_limit_exceeded.html
-Size: 2550
+Size: 2652
 
-G/UJABwFbqwNuR4GgSw3/lm6lrKbvp4evmQNHF84AGoQGJG93aewJ9KiNZUhFeUi
-hD2YvRAqKJBjuP39AqACshVGodStcJV9DnX/GAS8aKPYnRD1QIatuSy8LdESb7Nj
-9BC5A+Tfm6gokeI4jzUb71g3RDjeBvZRBwuZCQIb+f2j6XEDC4KjarUXsP6+YbeE
-J/R84b83+zfCfb10Icnd+rIMNFEnXiiuMiOC5ZsDjUhX4LqZdDy+9c0Qm/Sboop5
-gvwnWZQjt3A06N7Pur2piuq6a7btL1yh2sAmpXFeIbWoxlJWaJEiwiLVmmRvoiY1
-csv+TB0FFrkNgjrpSpSNQvgogBdaT6et+bBG1JGAJZRekP3YnAQEpH0eQBvIoAGV
-Yxur2GufAl5f9R5H6OcLsCqT1f7HwQImUuhDlq7rkEGsbwZPdHZJxISnZ8KlJ2vh
-vhiTaVjK/WZ7Hvz8LR2CJ0N7DGUSrihQhEiY86Ul9isKjQeDz0vXhnM8gD/IIMyM
-NHE70/CyvpEHnHax3AgUOfCxYYB9Xo0IkTRSbrUwuSmq0PR2kYFCq/IPwNgf+cQ1
-1F36/9zslESK44DCZBu/4qKei5Ds+v23l2mkAQ2wSiZhe45t6nbFtc3dkxAyw1b3
-H3TmrQLbEK9ZCMZA3ldvibxhFa7VL8L9z2xcgwD4PQ45Vq43+V3pA9Lw4SDb3PuX
-yFrYNGbKGL1qkVVRajOtQnIotJDxVYEoY1twg0NRhLxzpIq8MZopV7zpg8PuUWrM
-f1y8Ih/k2SCMNEswYwD0Vs4odUlKVw+1VnUGj0pcGIdbCCc4X40bRoPOVUMzqRBd
-G2IGcl+NG0bT0ENTAQI=
+G1sKABwFbqwNuR4GgSw3/lm6lrKbvp4e/Ut2hPEHgJs2CIzI3u5T2BPp/7dfi4sk
+UiOE+uTOIObNZd6fj4gmmnio5LKnE/MSIo2HtGUnsQSumPqfojvQUGtnluMSrfCV
+7WIKkQeA/N5Gh5JzHBcETcudmQwRkdfMPmlrEJMs0MIf7mWKGyBEIlXf+BkbbhvN
+5kiEvrP8PTmsKPc0OY32RRqYG5poIGkU1wmtgFW0O9ciXaX0zcTl+N6VEZb6W8wt
+lxnOP8njgrjCuUb3cuvypW7cNH277jxLh2pDSqxx20GqpCZSXnp2hgKLWivVXoqm
+G8mt7Peq52AKtxBoIK8jSosQvgrglc736tZiGGM3sQ0kWC8QPypJwCC2rQDQFnqh
+Ea7EFlRsJaWUbuh6zxIM5QJQ42w5/SzYNqQU78rovAkCYnPbeKLHdSomPT/Jl768
+w/rBhNyDodputwlDKN9KIvCiyGyl3MHkIlAFlbDg3JH4laXHg+Hnse+iTzyAf5BB
+vCbaxG9kxMsGRR9Y3lXVKsLRAp+aAJjvq5HxLO/LaTRK3qECPL1dFZBgV/4JFAfj
+gKSHumv/nxtOtV3jLGDfiNkELJOjcopay+K5ePjjz3YUk//ts194SqcN3VdB9/Pz
+Hy/3kIU0wii5AzP5dGS4G05dEeNCOx4l9Q4Ir3o5ETGo6DIo18TYrd8c8mUdznVn
+A+EPKfFFJv6eqJ6q8FYVKxsHOvfF4HSFyKDv5R1MHoLMn8h4h0B0dVrGPSmHaeRe
+vim0qxKbPFpjVFGxZMxyq7Vz4cp2CC/7R3W+4hPjNaWgFbZ4iYOEowMwT+PimO01
+7ghl3+0GHp2KaSKuEF49P5q0gtFG143MtNLuuwgfU/fRpBWMgHpsOrMA
 -----END COZY ASSET-----
 -----BEGIN COZY ASSET-----
 Name: /templates/oidc_login.html