diff --git a/pages/manage-apps-create.go.html b/pages/manage-apps-create.go.html
new file mode 100644
index 0000000..95d14c7
--- /dev/null
+++ b/pages/manage-apps-create.go.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>{{.ServiceName}}</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <link rel="stylesheet" href="/assets/style.css">
+    <script>
+        window.addEventListener("load", function () {
+            selectText("app-secret");
+        });
+
+        // Thanks again: https://stackoverflow.com/a/987376
+        function selectText(nodeId) {
+            const node = document.getElementById(nodeId);
+
+            if (document.body.createTextRange) {
+                const range = document.body.createTextRange();
+                range.moveToElementText(node);
+                range.select();
+            } else if (window.getSelection) {
+                const selection = window.getSelection();
+                const range = document.createRange();
+                range.selectNodeContents(node);
+                selection.removeAllRanges();
+                selection.addRange(range);
+            } else {
+                console.warn("Could not select text in node: Unsupported browser.");
+            }
+        }
+    </script>
+</head>
+<body>
+{{template "header.go.html" .}}
+<main>
+    <form method="GET" action="/">
+        <button type="submit">Home</button>
+    </form>
+
+    <h2>Create Client Application</h2>
+    <form method="POST" action="/manage/apps">
+        <input type="hidden" name="action" value="create"/>
+        <input type="hidden" name="offset" value="{{.Offset}}"/>
+        <div>
+            <label for="field_name">Name:</label>
+            <input type="text" name="name" id="field_name" required/>
+        </div>
+        <div>
+            <label for="field_domain">Domain:</label>
+            <input type="text" name="domain" id="field_domain" required/>
+        </div>
+        {{if .IsAdmin}}
+            <div>
+                <label for="field_perms">Perms:</label>
+                <input type="text" name="perms" id="field_perms"/>
+            </div>
+        {{end}}
+        <div>
+            <label for="field_public">Public: <input type="checkbox" name="public" id="field_public"/></label>
+        </div>
+        {{if .IsAdmin}}
+            <div>
+                <label for="field_sso">SSO: <input type="checkbox" name="sso" id="field_sso"/></label>
+            </div>
+        {{end}}
+        <div>
+            <label for="field_active">Active: <input type="checkbox" name="active" id="field_active" checked/></label>
+        </div>
+        <button type="submit">Create</button>
+    </form>
+</main>
+</body>
+</html>
diff --git a/pages/manage-apps-edit.go.html b/pages/manage-apps-edit.go.html
new file mode 100644
index 0000000..50e30a8
--- /dev/null
+++ b/pages/manage-apps-edit.go.html
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>{{.ServiceName}}</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <link rel="stylesheet" href="/assets/style.css">
+    <script>
+        window.addEventListener("load", function () {
+            selectText("app-secret");
+        });
+
+        // Thanks again: https://stackoverflow.com/a/987376
+        function selectText(nodeId) {
+            const node = document.getElementById(nodeId);
+
+            if (document.body.createTextRange) {
+                const range = document.body.createTextRange();
+                range.moveToElementText(node);
+                range.select();
+            } else if (window.getSelection) {
+                const selection = window.getSelection();
+                const range = document.createRange();
+                range.selectNodeContents(node);
+                selection.removeAllRanges();
+                selection.addRange(range);
+            } else {
+                console.warn("Could not select text in node: Unsupported browser.");
+            }
+        }
+    </script>
+</head>
+<body>
+{{template "header.go.html" .}}
+<main>
+    <form method="GET" action="/">
+        <button type="submit">Home</button>
+    </form>
+
+    <h2>Edit Client Application</h2>
+    <form method="POST" action="/manage/apps">
+        <input type="hidden" name="action" value="edit"/>
+        <input type="hidden" name="offset" value="{{.Offset}}"/>
+        <input type="hidden" name="subject" value="{{.EditApp.Subject}}"/>
+        <div>
+            <label>ID: {{.EditApp.Subject}}</label>
+        </div>
+        <div>
+            <label for="field_name">Name:</label>
+            <input type="text" name="name" id="field_name" value="{{.EditApp.Name}}" required/>
+        </div>
+        <div>
+            <label for="field_domain">Domain:</label>
+            <input type="text" name="domain" id="field_domain" value="{{.EditApp.Domain}}" required/>
+        </div>
+        {{if .IsAdmin}}
+            <div>
+                <label for="field_perms">Perms:</label>
+                <input type="text" name="perms" id="field_perms" value="{{.EditApp.Perms}}" size="100"/>
+            </div>
+        {{end}}
+        <div>
+            <label for="field_public">Public: <input type="checkbox" name="public" id="field_public" {{if .EditApp.Public}}checked{{end}}/></label>
+        </div>
+        {{if .IsAdmin}}
+            <div>
+                <label for="field_sso">SSO: <input type="checkbox" name="sso" id="field_sso" {{if .EditApp.Sso}}checked{{end}}/></label>
+            </div>
+        {{end}}
+        <div>
+            <label for="field_active">Active: <input type="checkbox" name="active" id="field_active" {{if .EditApp.Active}}checked{{end}}/></label>
+        </div>
+        <button type="submit">Edit</button>
+    </form>
+    <form method="GET" action="/manage/apps">
+        <input type="hidden" name="offset" value="{{.Offset}}"/>
+        <button type="submit">Cancel</button>
+    </form>
+</main>
+</body>
+</html>
diff --git a/pages/manage-apps.go.html b/pages/manage-apps.go.html
index 31abb87..7a92a65 100644
--- a/pages/manage-apps.go.html
+++ b/pages/manage-apps.go.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <title>{{.ServiceName}}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <link rel="stylesheet" href="/assets/style.css">
     <script>
         window.addEventListener("load", function () {
@@ -40,124 +40,53 @@
         <div>New application secret: <span id="app-secret">{{.NewAppSecret}}</span> for {{.NewAppName}}</div>
     {{end}}
 
-    {{if .EditApp}}
-        <h2>Edit Client Application</h2>
-        <form method="POST" action="/manage/apps">
-            <input type="hidden" name="action" value="edit"/>
-            <input type="hidden" name="offset" value="{{.Offset}}"/>
-            <input type="hidden" name="subject" value="{{.EditApp.Subject}}"/>
-            <div>
-                <label>ID: {{.EditApp.Subject}}</label>
-            </div>
-            <div>
-                <label for="field_name">Name:</label>
-                <input type="text" name="name" id="field_name" value="{{.EditApp.Name}}" required/>
-            </div>
-            <div>
-                <label for="field_domain">Domain:</label>
-                <input type="text" name="domain" id="field_domain" value="{{.EditApp.Domain}}" required/>
-            </div>
-            {{if .IsAdmin}}
-                <div>
-                    <label for="field_perms">Perms:</label>
-                    <input type="text" name="perms" id="field_perms" value="{{.EditApp.Perms}}" size="100"/>
-                </div>
-            {{end}}
-            <div>
-                <label for="field_public">Public: <input type="checkbox" name="public" id="field_public" {{if .EditApp.Public}}checked{{end}}/></label>
-            </div>
-            {{if .IsAdmin}}
-                <div>
-                    <label for="field_sso">SSO: <input type="checkbox" name="sso" id="field_sso" {{if .EditApp.SSO}}checked{{end}}/></label>
-                </div>
-            {{end}}
-            <div>
-                <label for="field_active">Active: <input type="checkbox" name="active" id="field_active" {{if .EditApp.Active}}checked{{end}}/></label>
-            </div>
-            <button type="submit">Edit</button>
-        </form>
-        <form method="GET" action="/manage/apps">
-            <input type="hidden" name="offset" value="{{.Offset}}"/>
-            <button type="submit">Cancel</button>
-        </form>
+    <h2>Manage Client Applications</h2>
+    <form method="GET" action="/manage/apps/create">
+        <button type="submit">New Client Application</button>
+    </form>
+    {{if eq (len .Apps) 0}}
+        <div>No client applications found</div>
     {{else}}
-        <h2>Manage Client Applications</h2>
-        {{if eq (len .Apps) 0}}
-            <div>No client applications found</div>
-        {{else}}
-            <table>
-                <thead>
+        <table>
+            <thead>
+            <tr>
+                <th>ID</th>
+                <th>Name</th>
+                <th>Domain</th>
+                <th>Perms</th>
+                <th>SSO</th>
+                <th>Active</th>
+                <th>Owner</th>
+                <th>Actions</th>
+            </tr>
+            </thead>
+            <tbody>
+            {{range .Apps}}
                 <tr>
-                    <th>ID</th>
-                    <th>Name</th>
-                    <th>Domain</th>
-                    <th>Perms</th>
-                    <th>SSO</th>
-                    <th>Active</th>
-                    <th>Owner</th>
-                    <th>Actions</th>
+                    <td>{{.Subject}}</td>
+                    <td>{{.Name}}</td>
+                    <td>{{.Domain}}</td>
+                    <td>{{.Perms}}</td>
+                    <td>{{.Sso}}</td>
+                    <td>{{.Active}}</td>
+                    <td>{{.Owner}}</td>
+                    <td>
+                        <form method="GET" action="/manage/apps">
+                            <input type="hidden" name="offset" value="{{$.Offset}}"/>
+                            <input type="hidden" name="edit" value="{{.Subject}}"/>
+                            <button type="submit">Edit</button>
+                        </form>
+                        <form method="POST" action="/manage/apps?offset={{$.Offset}}">
+                            <input type="hidden" name="action" value="secret"/>
+                            <input type="hidden" name="offset" value="{{$.Offset}}"/>
+                            <input type="hidden" name="subject" value="{{.Subject}}"/>
+                            <button type="submit">Reset Secret</button>
+                        </form>
+                    </td>
                 </tr>
-                </thead>
-                <tbody>
-                {{range .Apps}}
-                    <tr>
-                        <td>{{.Subject}}</td>
-                        <td>{{.Name}}</td>
-                        <td>{{.Domain}}</td>
-                        <td>{{.Perms}}</td>
-                        <td>{{.SSO}}</td>
-                        <td>{{.Active}}</td>
-                        <td>{{.Owner}}</td>
-                        <td>
-                            <form method="GET" action="/manage/apps">
-                                <input type="hidden" name="offset" value="{{$.Offset}}"/>
-                                <input type="hidden" name="edit" value="{{.Subject}}"/>
-                                <button type="submit">Edit</button>
-                            </form>
-                            <form method="POST" action="/manage/apps?offset={{$.Offset}}">
-                                <input type="hidden" name="action" value="secret"/>
-                                <input type="hidden" name="offset" value="{{$.Offset}}"/>
-                                <input type="hidden" name="subject" value="{{.Subject}}"/>
-                                <button type="submit">Reset Secret</button>
-                            </form>
-                        </td>
-                    </tr>
-                {{end}}
-                </tbody>
-            </table>
-        {{end}}
-
-        <h2>Create Client Application</h2>
-        <form method="POST" action="/manage/apps">
-            <input type="hidden" name="action" value="create"/>
-            <input type="hidden" name="offset" value="{{.Offset}}"/>
-            <div>
-                <label for="field_name">Name:</label>
-                <input type="text" name="name" id="field_name" required/>
-            </div>
-            <div>
-                <label for="field_domain">Domain:</label>
-                <input type="text" name="domain" id="field_domain" required/>
-            </div>
-            {{if .IsAdmin}}
-                <div>
-                    <label for="field_perms">Perms:</label>
-                    <input type="text" name="perms" id="field_perms"/>
-                </div>
             {{end}}
-            <div>
-                <label for="field_public">Public: <input type="checkbox" name="public" id="field_public"/></label>
-            </div>
-            {{if .IsAdmin}}
-                <div>
-                    <label for="field_sso">SSO: <input type="checkbox" name="sso" id="field_sso"/></label>
-                </div>
-            {{end}}
-            <div>
-                <label for="field_active">Active: <input type="checkbox" name="active" id="field_active" checked/></label>
-            </div>
-            <button type="submit">Create</button>
-        </form>
+            </tbody>
+        </table>
     {{end}}
 </main>
 </body>
diff --git a/pages/manage-users-edit.go.html b/pages/manage-users-edit.go.html
new file mode 100644
index 0000000..6b1b47f
--- /dev/null
+++ b/pages/manage-users-edit.go.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>{{.ServiceName}}</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <link rel="stylesheet" href="/assets/style.css">
+</head>
+<body>
+{{template "header.go.html" .}}
+<main>
+    <form method="GET" action="/">
+        <button type="submit">Home</button>
+    </form>
+
+    <h2>Edit User</h2>
+    <form method="POST" action="/manage/users">
+        <input type="hidden" name="action" value="edit"/>
+        <input type="hidden" name="offset" value="{{.Offset}}"/>
+        <div>
+            <label for="field_subject">Subject:</label>
+            <input type="text" name="subject" id="field_subject" value="{{.EditUser.Subject}}" required/>
+        </div>
+        <div>
+            <label for="field_roles">Roles:</label>
+            <input type="text" name="roles" id="field_roles" value="{{.EditUser.Roles}}" size="100"/>
+        </div>
+        <div>
+            <label for="field_active">Active: <input type="checkbox" name="active" id="field_active" checked/></label>
+        </div>
+        <button type="submit">Edit</button>
+    </form>
+    <form method="GET" action="/manage/users">
+        <input type="hidden" name="offset" value="{{.Offset}}"/>
+        <button type="submit">Cancel</button>
+    </form>
+</main>
+</body>
+</html>
diff --git a/pages/manage-users.go.html b/pages/manage-users.go.html
index 7bc179b..900163d 100644
--- a/pages/manage-users.go.html
+++ b/pages/manage-users.go.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <title>{{.ServiceName}}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <link rel="stylesheet" href="/assets/style.css">
 </head>
 <body>
@@ -12,83 +12,59 @@
         <button type="submit">Home</button>
     </form>
 
-    {{if .EditUser}}
-        <h2>Edit User</h2>
-        <form method="POST" action="/manage/users">
-            <input type="hidden" name="action" value="edit"/>
-            <input type="hidden" name="offset" value="{{.Offset}}"/>
-            <div>
-                <label for="field_subject">Subject:</label>
-                <input type="text" name="subject" id="field_subject" value="{{.EditUser.Subject}}" required/>
-            </div>
-            <div>
-                <label for="field_roles">Roles:</label>
-                <input type="text" name="roles" id="field_roles" value="{{.EditUser.Roles}}" size="100"/>
-            </div>
-            <div>
-                <label for="field_active">Active: <input type="checkbox" name="active" id="field_active" checked/></label>
-            </div>
-            <button type="submit">Edit</button>
-        </form>
+    <h2>Manage Users</h2>
+    {{if eq (len .Users) 0}}
+        <div>No users found, this is definitely a bug.</div>
+    {{else}}
+        <table>
+            <thead>
+            <tr>
+                <th>Subject</th>
+                <th>Email</th>
+                <th>Email Verified</th>
+                <th>Roles</th>
+                <th>Last Updated</th>
+                <th>Active</th>
+                <th>Actions</th>
+            </tr>
+            </thead>
+            <tbody>
+            {{range .Users}}
+                <tr>
+                    <td>{{.Subject}}</td>
+                    <th>
+                        {{if $.EmailShow}}
+                            <span>{{.Email}}</span>
+                        {{else}}
+                            <span>{{emailHide .Email}}</span>
+                        {{end}}
+                    </th>
+                    <th>{{.EmailVerified}}</th>
+                    <th>{{.Roles}}</th>
+                    <th>{{.UpdatedAt}}</th>
+                    <td>{{.Active}}</td>
+                    <td>
+                        <form method="GET" action="/manage/users">
+                            <input type="hidden" name="offset" value="{{$.Offset}}"/>
+                            <input type="hidden" name="edit" value="{{.Subject}}"/>
+                            <button type="submit">Edit</button>
+                        </form>
+                        <form method="POST" action="/reset-password">
+                            <input type="hidden" name="email" value="{{.Email}}"/>
+                            <button type="submit">Send Reset Password Email</button>
+                        </form>
+                    </td>
+                </tr>
+            {{end}}
+            </tbody>
+        </table>
         <form method="GET" action="/manage/users">
             <input type="hidden" name="offset" value="{{.Offset}}"/>
-            <button type="submit">Cancel</button>
+            {{if not .EmailShow}}
+                <input type="hidden" name="show-email"/>
+            {{end}}
+            <button type="submit">{{if .EmailShow}}Hide Email Addresses{{else}}Show email addresses{{end}}</button>
         </form>
-    {{else}}
-        <h2>Manage Users</h2>
-        {{if eq (len .Users) 0}}
-            <div>No users found, this is definitely a bug.</div>
-        {{else}}
-            <table>
-                <thead>
-                <tr>
-                    <th>Subject</th>
-                    <th>Email</th>
-                    <th>Email Verified</th>
-                    <th>Roles</th>
-                    <th>Last Updated</th>
-                    <th>Active</th>
-                    <th>Actions</th>
-                </tr>
-                </thead>
-                <tbody>
-                {{range .Users}}
-                    <tr>
-                        <td>{{.Subject}}</td>
-                        <th>
-                            {{if $.EmailShow}}
-                                <span>{{.Email}}</span>
-                            {{else}}
-                                <span>{{emailHide .Email}}</span>
-                            {{end}}
-                        </th>
-                        <th>{{.EmailVerified}}</th>
-                        <th>{{.Roles}}</th>
-                        <th>{{.UpdatedAt}}</th>
-                        <td>{{.Active}}</td>
-                        <td>
-                            <form method="GET" action="/manage/users">
-                                <input type="hidden" name="offset" value="{{$.Offset}}"/>
-                                <input type="hidden" name="edit" value="{{.Subject}}"/>
-                                <button type="submit">Edit</button>
-                            </form>
-                            <form method="POST" action="/reset-password">
-                                <input type="hidden" name="email" value="{{.Email}}"/>
-                                <button type="submit">Send Reset Password Email</button>
-                            </form>
-                        </td>
-                    </tr>
-                {{end}}
-                </tbody>
-            </table>
-            <form method="GET" action="/manage/users">
-                <input type="hidden" name="offset" value="{{.Offset}}"/>
-                {{if not .EmailShow}}
-                    <input type="hidden" name="show-email"/>
-                {{end}}
-                <button type="submit">{{if .EmailShow}}Hide Email Addresses{{else}}Show email addresses{{end}}</button>
-            </form>
-        {{end}}
     {{end}}
 </main>
 </body>
diff --git a/server/manage-apps.go b/server/manage-apps.go
index 2f367bb..eab8807 100644
--- a/server/manage-apps.go
+++ b/server/manage-apps.go
@@ -63,6 +63,25 @@ func (h *HttpServer) ManageAppsGet(rw http.ResponseWriter, req *http.Request, _
 	pages.RenderPageTemplate(rw, "manage-apps", m)
 }
 
+func (h *HttpServer) ManageAppsCreateGet(rw http.ResponseWriter, _ *http.Request, _ httprouter.Params, auth UserAuth) {
+	var roles string
+	if h.DbTx(rw, func(tx *database.Tx) (err error) {
+		roles, err = tx.GetUserRoles(auth.Subject)
+		return
+	}) {
+		return
+	}
+
+	m := map[string]any{
+		"ServiceName": h.conf.ServiceName,
+		"IsAdmin":     HasRole(roles, "lavender:admin"),
+	}
+
+	rw.Header().Set("Content-Type", "text/html")
+	rw.WriteHeader(http.StatusOK)
+	pages.RenderPageTemplate(rw, "manage-apps-create", m)
+}
+
 func (h *HttpServer) ManageAppsPost(rw http.ResponseWriter, req *http.Request, _ httprouter.Params, auth UserAuth) {
 	err := req.ParseForm()
 	if err != nil {
diff --git a/server/server.go b/server/server.go
index c86f758..ab6f4ff 100644
--- a/server/server.go
+++ b/server/server.go
@@ -152,6 +152,7 @@ func NewHttpServer(conf Conf, db *database.DB, signingKey mjwt.Signer) *http.Ser
 
 	// management pages
 	r.GET("/manage/apps", hs.RequireAuthentication(hs.ManageAppsGet))
+	r.GET("/manage/apps/create", hs.RequireAuthentication(hs.ManageAppsCreateGet))
 	r.POST("/manage/apps", hs.RequireAuthentication(hs.ManageAppsPost))
 	r.GET("/manage/users", hs.RequireAdminAuthentication(hs.ManageUsersGet))
 	r.POST("/manage/users", hs.RequireAdminAuthentication(hs.ManageUsersPost))
