diff --git a/share/wildduck/haraka.tf b/share/wildduck/haraka.tf
index c65758e..23be8d2 100644
--- a/share/wildduck/haraka.tf
+++ b/share/wildduck/haraka.tf
@@ -198,13 +198,7 @@ resource "kubectl_manifest" "haraka_config" {
             host: "${var.instance}-${var.component}-redis.${var.namespace}.svc"
             db: 3
         mongo:
-            # connection string for main messages database
             url: 'mongodb://${var.component}:${local.mongo-password}@${var.instance}-${var.component}-mongo-svc.${var.namespace}.svc:27017/wildduck'
-            ## database name or connection string for the users db
-            #users: "users"
-            ## database name or connection string for the attachments db
-            #gridfs: "attachments"
-            ## database name or connection string for the outbound queue
             sender: 'zone-mta'
         sender:
             # Push messages to ZoneMTA queue for delivery
diff --git a/share/wildduck/index.yaml b/share/wildduck/index.yaml
index d2daa72..6e84351 100644
--- a/share/wildduck/index.yaml
+++ b/share/wildduck/index.yaml
@@ -6,15 +6,15 @@ metadata:
   name: wildduck
   description: null
 options:
-  domain-name:
-    default: your_company.com
+  additional-domains:
+    default: []
+    items:
+      type: string
+    type: array
+  issuer:
+    default: letsencrypt-prod
     examples:
-    - your_company.com
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
+    - letsencrypt-prod
     type: string
   redis:
     default:
@@ -49,6 +49,16 @@ options:
         default: 2Gi
         type: string
     type: object
+  sub-domain:
+    default: mail
+    examples:
+    - mail
+    type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   backups:
     default:
       enable: false
@@ -79,16 +89,16 @@ options:
         default: backup-settings
         type: string
     type: object
-  sub-domain:
-    default: mail
-    examples:
-    - mail
-    type: string
   ingress-class:
     default: traefik
     examples:
     - traefik
     type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
   images:
     default:
       haraka:
@@ -252,16 +262,6 @@ options:
             type: string
         type: object
     type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  additional-domains:
-    default: []
-    items:
-      type: string
-    type: array
 dependencies:
 - dist: null
   category: dbo
diff --git a/share/wildduck/secret.tf b/share/wildduck/secret.tf
index c90b1fd..7d59194 100644
--- a/share/wildduck/secret.tf
+++ b/share/wildduck/secret.tf
@@ -22,6 +22,8 @@ resource "kubectl_manifest" "wildduck_secret" {
         length: "32"
       - fieldName: "access"
         length: "32"
+      - fieldName: "authentik" # Bearer for authentik to wildduck-scim
+        length: "32"
   EOF
 }
 data "kubernetes_secret_v1" "wildduck" {
diff --git a/share/wildduck/webmail.tf b/share/wildduck/webmail.tf
index e88c3a9..7b0fc89 100644
--- a/share/wildduck/webmail.tf
+++ b/share/wildduck/webmail.tf
@@ -52,6 +52,9 @@ resource "kubectl_manifest" "webmail_deploy" {
             resources:
               {}
             volumeMounts:
+            - name: config
+              mountPath: /wildduck/views/index.hbs
+              subPath: index.hbs
             - name: config
               mountPath: /app/config/webmail.toml
               subPath: webmail.toml
@@ -71,6 +74,19 @@ resource "kubectl_manifest" "webmail_config" {
       namespace: "${var.namespace}"
       labels: ${jsonencode(local.webmail-labels)}
     data:
+      index.hbs: |-
+        <div class="row">
+            <div class="col-md-12">
+                <h1><span class="glyphicon glyphicon-inbox" aria-hidden="true"></span> {{serviceName}}</h1>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <p>
+                    <a class="btn btn-success btn-md" href="/account/login" role="button"><span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> Log in</a>
+                </p>
+            </div>
+        </div>
       webmail.toml: |-
         name="Wild Duck Mail"