diff --git a/locales/en/messages.gotext.json b/locales/en/messages.gotext.json
index 624594a..3f59650 100644
--- a/locales/en/messages.gotext.json
+++ b/locales/en/messages.gotext.json
@@ -13,7 +13,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "name"
+                    "expr": "p.Client.Name"
                 }
             ],
             "fuzzy": true
diff --git a/locales/en/out.gotext.json b/locales/en/out.gotext.json
index 624594a..3f59650 100644
--- a/locales/en/out.gotext.json
+++ b/locales/en/out.gotext.json
@@ -13,7 +13,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "name"
+                    "expr": "p.Client.Name"
                 }
             ],
             "fuzzy": true
diff --git a/locales/ru/messages.gotext.json b/locales/ru/messages.gotext.json
index d62723b..6e51be6 100644
--- a/locales/ru/messages.gotext.json
+++ b/locales/ru/messages.gotext.json
@@ -13,7 +13,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "name"
+                    "expr": "p.Client.Name"
                 }
             ]
         },
diff --git a/locales/ru/out.gotext.json b/locales/ru/out.gotext.json
index d62723b..6e51be6 100644
--- a/locales/ru/out.gotext.json
+++ b/locales/ru/out.gotext.json
@@ -13,7 +13,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "name"
+                    "expr": "p.Client.Name"
                 }
             ]
         },
diff --git a/web/authorize.qtpl b/web/authorize.qtpl
index 17330ba..3158500 100644
--- a/web/authorize.qtpl
+++ b/web/authorize.qtpl
@@ -17,8 +17,8 @@
 } %}
 
 {% func (p *AuthorizePage) title() %}
-{% if name := p.Client.GetName(); name != "" %}
-{%= p.t("Authorize %s", name) %}
+{% if p.Client.Name != "" %}
+{%= p.t("Authorize %s", p.Client.Name) %}
 {% else %}
 {%= p.t("Authorize application") %}
 {% endif %}
@@ -26,7 +26,7 @@
 
 {% func (p *AuthorizePage) body() %}
 <header>
-  {% if p.Client.GetLogo() != nil %}
+  {% if p.Client.Logo != nil %}
   <img class=""
        crossorigin="anonymous"
        decoding="async"
@@ -34,21 +34,21 @@
        importance="high"
        loading="lazy"
        referrerpolicy="no-referrer-when-downgrade"
-       src="{%s p.Client.GetLogo().String() %}"
-       alt="{%s p.Client.GetName() %}"
+       src="{%s p.Client.Logo.String() %}"
+       alt="{%s p.Client.Name %}"
        width="140">
   {% endif %}
 
   <h2>
-    {% if p.Client.GetURL() != nil %}
-    <a href="{%s p.Client.GetURL().String() %}">
+    {% if p.Client.URL != nil %}
+    <a href="{%s p.Client.URL.String() %}">
       {% endif %}
-      {% if p.Client.GetName() != "" %}
-      {%s p.Client.GetName() %}
+      {% if p.Client.Name != "" %}
+      {%s p.Client.Name %}
       {% else %}
       {%s p.Client.ID.String() %}
       {% endif %}
-      {% if p.Client.GetURL() != nil %}
+      {% if p.Client.URL != nil %}
     </a>
     {% endif %}
   </h2>
diff --git a/web/authorize.qtpl.go b/web/authorize.qtpl.go
index 055d637..28cb8a8 100644
--- a/web/authorize.qtpl.go
+++ b/web/authorize.qtpl.go
@@ -43,12 +43,12 @@ func (p *AuthorizePage) streamtitle(qw422016 *qt422016.Writer) {
 	qw422016.N().S(`
 `)
 //line web/authorize.qtpl:20
-	if name := p.Client.GetName(); name != "" {
+	if p.Client.Name != "" {
 //line web/authorize.qtpl:20
 		qw422016.N().S(`
 `)
 //line web/authorize.qtpl:21
-		p.streamt(qw422016, "Authorize %s", name)
+		p.streamt(qw422016, "Authorize %s", p.Client.Name)
 //line web/authorize.qtpl:21
 		qw422016.N().S(`
 `)
@@ -103,7 +103,7 @@ func (p *AuthorizePage) streambody(qw422016 *qt422016.Writer) {
 <header>
   `)
 //line web/authorize.qtpl:29
-	if p.Client.GetLogo() != nil {
+	if p.Client.Logo != nil {
 //line web/authorize.qtpl:29
 		qw422016.N().S(`
   <img class=""
@@ -115,12 +115,12 @@ func (p *AuthorizePage) streambody(qw422016 *qt422016.Writer) {
        referrerpolicy="no-referrer-when-downgrade"
        src="`)
 //line web/authorize.qtpl:37
-		qw422016.E().S(p.Client.GetLogo().String())
+		qw422016.E().S(p.Client.Logo.String())
 //line web/authorize.qtpl:37
 		qw422016.N().S(`"
        alt="`)
 //line web/authorize.qtpl:38
-		qw422016.E().S(p.Client.GetName())
+		qw422016.E().S(p.Client.Name)
 //line web/authorize.qtpl:38
 		qw422016.N().S(`"
        width="140">
@@ -133,12 +133,12 @@ func (p *AuthorizePage) streambody(qw422016 *qt422016.Writer) {
   <h2>
     `)
 //line web/authorize.qtpl:43
-	if p.Client.GetURL() != nil {
+	if p.Client.URL != nil {
 //line web/authorize.qtpl:43
 		qw422016.N().S(`
     <a href="`)
 //line web/authorize.qtpl:44
-		qw422016.E().S(p.Client.GetURL().String())
+		qw422016.E().S(p.Client.URL.String())
 //line web/authorize.qtpl:44
 		qw422016.N().S(`">
       `)
@@ -148,12 +148,12 @@ func (p *AuthorizePage) streambody(qw422016 *qt422016.Writer) {
 	qw422016.N().S(`
       `)
 //line web/authorize.qtpl:46
-	if p.Client.GetName() != "" {
+	if p.Client.Name != "" {
 //line web/authorize.qtpl:46
 		qw422016.N().S(`
       `)
 //line web/authorize.qtpl:47
-		qw422016.E().S(p.Client.GetName())
+		qw422016.E().S(p.Client.Name)
 //line web/authorize.qtpl:47
 		qw422016.N().S(`
       `)
@@ -173,7 +173,7 @@ func (p *AuthorizePage) streambody(qw422016 *qt422016.Writer) {
 	qw422016.N().S(`
       `)
 //line web/authorize.qtpl:51
-	if p.Client.GetURL() != nil {
+	if p.Client.URL != nil {
 //line web/authorize.qtpl:51
 		qw422016.N().S(`
     </a>
diff --git a/web/home.qtpl b/web/home.qtpl
index b71d167..39e724f 100644
--- a/web/home.qtpl
+++ b/web/home.qtpl
@@ -19,21 +19,23 @@
 
 {% func (p *HomePage) body() %}
 <header class="h-app h-x-app">
+  {% if p.Client.Logo != nil %}
   <img class="u-logo"
-       src="{%s p.Client.GetLogo().String() %}"
-       alt="{%s p.Client.GetName() %}"
+       src="{%s p.Client.Logo.String() %}"
+       alt="{%s p.Client.Name %}"
        crossorigin="anonymous"
        decoding="async"
        height="140"
        importance="high"
        referrerpolicy="no-referrer-when-downgrade"
        width="140">
+  {% endif %}
 
   <h1>
     <a class="p-name u-url"
-       href="{%s p.Client.GetURL().String() %}">
+       href="{%s p.Client.URL.String() %}">
 
-      {%s p.Client.GetName() %}
+      {%s p.Client.Name %}
     </a>
   </h1>
 </header>
diff --git a/web/home.qtpl.go b/web/home.qtpl.go
index e8572b8..4866844 100644
--- a/web/home.qtpl.go
+++ b/web/home.qtpl.go
@@ -81,24 +81,32 @@ func (p *HomePage) head() string {
 //line web/home.qtpl:20
 func (p *HomePage) streambody(qw422016 *qt422016.Writer) {
 //line web/home.qtpl:20
-	qw422016.N().S(` <header class="h-app h-x-app"> <img class="u-logo" src="`)
-//line web/home.qtpl:23
-	qw422016.E().S(p.Client.GetLogo().String())
-//line web/home.qtpl:23
-	qw422016.N().S(`" alt="`)
+	qw422016.N().S(` <header class="h-app h-x-app"> `)
+//line web/home.qtpl:22
+	if p.Client.Logo != nil {
+//line web/home.qtpl:22
+		qw422016.N().S(` <img class="u-logo" src="`)
 //line web/home.qtpl:24
-	qw422016.E().S(p.Client.GetName())
+		qw422016.E().S(p.Client.Logo.String())
 //line web/home.qtpl:24
-	qw422016.N().S(`" crossorigin="anonymous" decoding="async" height="140" importance="high" referrerpolicy="no-referrer-when-downgrade" width="140"> <h1> <a class="p-name u-url" href="`)
-//line web/home.qtpl:34
-	qw422016.E().S(p.Client.GetURL().String())
-//line web/home.qtpl:34
+		qw422016.N().S(`" alt="`)
+//line web/home.qtpl:25
+		qw422016.E().S(p.Client.Name)
+//line web/home.qtpl:25
+		qw422016.N().S(`" crossorigin="anonymous" decoding="async" height="140" importance="high" referrerpolicy="no-referrer-when-downgrade" width="140"> `)
+//line web/home.qtpl:32
+	}
+//line web/home.qtpl:32
+	qw422016.N().S(` <h1> <a class="p-name u-url" href="`)
+//line web/home.qtpl:36
+	qw422016.E().S(p.Client.URL.String())
+//line web/home.qtpl:36
 	qw422016.N().S(`"> `)
-//line web/home.qtpl:36
-	qw422016.E().S(p.Client.GetName())
-//line web/home.qtpl:36
+//line web/home.qtpl:38
+	qw422016.E().S(p.Client.Name)
+//line web/home.qtpl:38
 	qw422016.N().S(` </a> </h1> </header> <main> <form class="" method="get" action="/authorize" enctype="application/x-www-form-urlencoded" accept-charset="utf-8" target="_self"> `)
-//line web/home.qtpl:49
+//line web/home.qtpl:51
 	for name, value := range map[string]string{
 		"client_id":     p.Client.ID.String(),
 		"redirect_uri":  p.Client.RedirectURI[0].String(),
@@ -106,49 +114,49 @@ func (p *HomePage) streambody(qw422016 *qt422016.Writer) {
 		"scope":         domain.Scopes{domain.ScopeEmail, domain.ScopeProfile}.String(),
 		"state":         p.State,
 	} {
-//line web/home.qtpl:55
+//line web/home.qtpl:57
 		qw422016.N().S(` <input type="hidden" name="`)
-//line web/home.qtpl:57
+//line web/home.qtpl:59
 		qw422016.E().S(name)
-//line web/home.qtpl:57
+//line web/home.qtpl:59
 		qw422016.N().S(`" value="`)
-//line web/home.qtpl:58
+//line web/home.qtpl:60
 		qw422016.E().S(value)
-//line web/home.qtpl:58
+//line web/home.qtpl:60
 		qw422016.N().S(`"> `)
-//line web/home.qtpl:59
+//line web/home.qtpl:61
 	}
-//line web/home.qtpl:59
+//line web/home.qtpl:61
 	qw422016.N().S(` <input type="url" name="me" placeholder="https://example.com/" inputmode="url" autocomplete="url" required> <button type="submit">`)
-//line web/home.qtpl:68
+//line web/home.qtpl:70
 	p.streamt(qw422016, "Sign In")
-//line web/home.qtpl:68
+//line web/home.qtpl:70
 	qw422016.N().S(`</button> </form> </main> `)
-//line web/home.qtpl:71
+//line web/home.qtpl:73
 }
 
-//line web/home.qtpl:71
+//line web/home.qtpl:73
 func (p *HomePage) writebody(qq422016 qtio422016.Writer) {
-//line web/home.qtpl:71
+//line web/home.qtpl:73
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line web/home.qtpl:71
+//line web/home.qtpl:73
 	p.streambody(qw422016)
-//line web/home.qtpl:71
+//line web/home.qtpl:73
 	qt422016.ReleaseWriter(qw422016)
-//line web/home.qtpl:71
+//line web/home.qtpl:73
 }
 
-//line web/home.qtpl:71
+//line web/home.qtpl:73
 func (p *HomePage) body() string {
-//line web/home.qtpl:71
+//line web/home.qtpl:73
 	qb422016 := qt422016.AcquireByteBuffer()
-//line web/home.qtpl:71
+//line web/home.qtpl:73
 	p.writebody(qb422016)
-//line web/home.qtpl:71
+//line web/home.qtpl:73
 	qs422016 := string(qb422016.B)
-//line web/home.qtpl:71
+//line web/home.qtpl:73
 	qt422016.ReleaseByteBuffer(qb422016)
-//line web/home.qtpl:71
+//line web/home.qtpl:73
 	return qs422016
-//line web/home.qtpl:71
+//line web/home.qtpl:73
 }