diff --git a/src/components/app/CreatorView.svelte b/src/components/app/CreatorView.svelte
index 63ad55bad..387d7fb83 100644
--- a/src/components/app/CreatorView.svelte
+++ b/src/components/app/CreatorView.svelte
@@ -14,7 +14,7 @@
         >{/if}{creator
         ? creator.email === null
             ? '—'
-            : anonymize
+            : anonymize || creator.email.endsWith('@wordplay.dev')
             ? creator.email.split('@')[0].substring(0, 4)
             : creator.email
         : $locales.get((l) => l.ui.page.login.anonymous)}</div
diff --git a/src/components/widgets/Note.svelte b/src/components/widgets/Note.svelte
index 9941a0d8e..d84045917 100644
--- a/src/components/widgets/Note.svelte
+++ b/src/components/widgets/Note.svelte
@@ -11,7 +11,7 @@
 <style>
     div {
         font-style: italic;
-        font-size: 14pt;
+        font-size: calc(var(--wordplay-font-size) - 2pt);
         color: var(--wordplay-inactive-color);
     }
 
diff --git a/src/components/widgets/TextField.svelte b/src/components/widgets/TextField.svelte
index 4cfdb388b..eb7275536 100644
--- a/src/components/widgets/TextField.svelte
+++ b/src/components/widgets/TextField.svelte
@@ -13,7 +13,7 @@
     export let right = false;
     export let defaultFocus = false;
     export let editable = true;
-    export let email = false;
+    export let kind: 'email' | 'password' | undefined = undefined;
 
     let width = 0;
 
@@ -23,7 +23,8 @@
     }
 
     onMount(() => {
-        if (email && view) view.type = 'email';
+        if (kind === 'email' && view) view.type = 'email';
+        else if (kind === 'password' && view) view.type = 'password';
     });
 </script>
 
@@ -47,7 +48,11 @@
         on:blur={() => (done ? done(text) : undefined)}
     />
     <span class="measurer" bind:clientWidth={width}
-        >{text.length === 0 ? placeholder : text}</span
+        >{text.length === 0
+            ? placeholder
+            : kind === 'password'
+            ? '•'.repeat(text.length)
+            : text}</span
     >
 </div>
 
diff --git a/src/locale/UITexts.ts b/src/locale/UITexts.ts
index 81fff7c76..221126df4 100644
--- a/src/locale/UITexts.ts
+++ b/src/locale/UITexts.ts
@@ -647,6 +647,12 @@ type UITexts = {
         login: {
             /** Header for the login page when not logged in */
             header: string;
+            subheader: {
+                /** Header for logging in via email */
+                email: string;
+                /** Header for logging in via username and password */
+                username: string;
+            };
             prompt: {
                 /** Prompts creator to login to save their work */
                 login: string;
@@ -658,6 +664,10 @@ type UITexts = {
                 enter: string;
                 /** Encouragement to go create after logging in. */
                 play: string;
+                /** Gives rules for emails above the login form */
+                emailrules: string;
+                /** Gives rules for usernames and passwords above the login form */
+                usernamerules: string;
                 /** Offers to log out the creator. */
                 logout: string;
                 /** Shown briefly before page redirects to projects */
@@ -670,12 +680,18 @@ type UITexts = {
                 reallyDelete: string;
                 /** Pick an emoji as a name */
                 name: string;
+                /** Text for age prompt */
+                age: ModeText<[string, string]>;
             };
             /** Shown in the footer a creator is not logged in. */
             anonymous: string;
             field: {
                 /** The login email */
                 email: FieldText;
+                /** The login username */
+                username: FieldText;
+                /** The login password */
+                password: FieldText;
             };
             feedback: {
                 /** Change email pending */
@@ -694,10 +710,12 @@ type UITexts = {
                 failure: string;
                 /** When there's no connection to Firebase */
                 offline: string;
-                /** When the email addres couldn't be changed for unknown reasons. */
+                /** When the email address couldn't be changed for unknown reasons. */
                 unchanged: string;
                 /** When account deletion failed */
                 delete: string;
+                /** When a password is wrong */
+                wrongPassword: string;
             };
             button: {
                 /** Log out of the account */
diff --git a/src/locale/en-US.json b/src/locale/en-US.json
index 611fd264d..ad3051df9 100644
--- a/src/locale/en-US.json
+++ b/src/locale/en-US.json
@@ -4168,11 +4168,21 @@
             },
             "login": {
                 "header": "Login",
+                "subheader": {
+                    "email": "email link",
+                    "username": "username + password"
+                },
                 "anonymous": "login",
                 "prompt": {
                     "login": "Your performances are saving on this device, but not online. If this is your device, that's okay! If it's not, others may see or delete your projects. To save them online and keep them private, log in.",
+                    "age": {
+                        "label": "What's your age?",
+                        "modes": ["12 or younger", "13 or older"]
+                    },
                     "enter": "It looks like your login link came from a different browser or device. Can you enter your email again, just so we're sure it's you?",
                     "play": "You're logged in, we can save your projects online now! Want to create something?",
+                    "emailrules": "Don't provide your email if you are 12 or younger.",
+                    "usernamerules": "Usernames should not contain identiable information. Passwords must be at least 10 characters long.",
                     "change": "Want to change your email? Submit a new one and we'll send a confirmation to the old one.",
                     "sent": "Check your email for a login link.",
                     "logout": "Leaving a shared device and want to keep your projects private? Logout and we'll remove your projects from this device. They will still be stored online.",
@@ -4189,7 +4199,8 @@
                     "failure": "Unable to login :(",
                     "offline": "You appear to be offline.",
                     "unchanged": "We couldn't change your email address, but we don't know why.",
-                    "delete": "We couldn't delete your account, but we don't know why."
+                    "delete": "We couldn't delete your account, but we don't know why.",
+                    "wrongPassword": "Not a valid username and password"
                 },
                 "feedback": {
                     "changing": "Submitting new email...",
@@ -4199,6 +4210,14 @@
                     "email": {
                         "description": "edit login email",
                         "placeholder": "email"
+                    },
+                    "username": {
+                        "description": "login username, don't use personally identifiable information",
+                        "placeholder": "username"
+                    },
+                    "password": {
+                        "description": "login password, at least 10 character",
+                        "placeholder": "password"
                     }
                 },
                 "button": {
@@ -4226,11 +4245,11 @@
                     "The first thing to know is that we are not a commercial entity. We are a community-based research project housed at a not-for-profit university. Our goal is to create a platform that brings you joy and helps us make discoveries about a more equitable and just world of computing. We have no interest in making money on this platform; any money we gather (usually through public funding) is used to sustain the platform, not to enrich anyone who works on it (or contributes to it).",
                     "Because we are not seeking profit, this also means that we can't make any promises about the reliability, availability, or longevity of this platform. That said, <Amy@https://amyjko.phd> is committed long term to sustaining it, and as a tenured professor, she's got a pretty stable gig.",
                     "That brings is to *data*. Here's what we gather and store in the cloud:",
-                    "• Your *email address*. We use this to ensure that only you and anyone you share with can access your projects and settings.",
-                    "• Your *projects*. We store any projects you contribute. This includes any personally identifiable information you put in your projects (which could be anything, since it's all text!)",
+                    "• If you are 13 or older, your *email address*. We use this to ensure that only you and anyone you share with can access your projects and settings. If you are younger than 13, then we only store the username you choose, which you should ensure doesn't contain any personally identiable information.",
+                    "• Your *projects*. We store any projects you contribute.",
                     "• Your *settings*. This includes the locales you choose, your animation preferences, and your tutorial progress. Everything else is stored on your device.",
-                    "• *Traffic*. We use basic <Google Analytics@https://en.wikipedia.org/wiki/Google_Analytics> to gather aggregate, anonymous data about which pages people and projects people are visiting and how many times. We use this to help raise funding to sustain the platform.",
-                    "We don't store anything else. No 'cookies' other than those used by Google Analytics, no tracking identifiers, no recordings of camera or microphone input. Our <source@https://github.com/amyjko/wordplay/tree/main/src> is public, so you can verify this if you wish at any time.",
+                    "• Your anonymized *activity*. We track the projects you view, the size of your screen, when you leave the site, when you read to the end of a page, and when you login.  We use this to help prioritize engineering work, and to help raise funding by reporting how much the platform is being used in the aggregate. None of these events are in linked to you, and we do not track you across websites.",
+                    "We don't store anything else. No 'cookies', no IP tracking, no recordings of any camera or microphone input. Our <source@https://github.com/amyjko/wordplay/tree/main/src> is public, so anyone can verify this, and report any unintended tracking.",
                     "*You* own your data, not us. That means:",
                     "• You control who can access your projects. They are private by default, but you can share them with individuals, groups, or make them entirely public.",
                     "• You can fully delete any project or your own account at any time.",
diff --git a/src/routes/login/Login.svelte b/src/routes/login/Login.svelte
index f8eb2930d..415401ce3 100644
--- a/src/routes/login/Login.svelte
+++ b/src/routes/login/Login.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
     import {
+        createUserWithEmailAndPassword,
         isSignInWithEmailLink,
         sendSignInLinkToEmail,
+        signInWithEmailAndPassword,
     } from 'firebase/auth';
     import Header from '../../components/app/Header.svelte';
     import TextField from '../../components/widgets/TextField.svelte';
@@ -17,6 +19,10 @@
     import { FirebaseError } from 'firebase/app';
     import { getLoginErrorDescription } from './login';
     import { goto } from '$app/navigation';
+    import Mode from '../../components/widgets/Mode.svelte';
+    import Subheader from '../../components/app/Subheader.svelte';
+    import MarkupHtmlView from '../../components/concepts/MarkupHTMLView.svelte';
+    import Note from '../../components/widgets/Note.svelte';
 
     let user = getUser();
     let success: boolean | undefined = undefined;
@@ -25,11 +31,17 @@
     let email: string;
     let sent = false;
     let loginFeedback = '';
+    let younger = true;
+    let username = '';
+    let password = '';
 
-    $: submittable = !sent && validEmail(email);
+    $: emailSubmittable = !sent && validEmail(email);
 
-    async function startLogin() {
-        if (auth && submittable) {
+    $: usernameSubmittable =
+        !sent && username.length > 4 && password.length >= 10;
+
+    async function startEmailLogin() {
+        if (auth && emailSubmittable) {
             try {
                 if (isSignInWithEmailLink(auth, window.location.href))
                     finishLogin();
@@ -45,7 +57,7 @@
                     sent = true;
                 }
             } catch (err) {
-                communicateLoginFailure(err);
+                communicateError(err);
             }
         }
     }
@@ -80,16 +92,47 @@
                             // Remove the query on the URL so there's no attempt to login on refresh.
                             goto('/login');
                         })
-                        .catch((err) => communicateLoginFailure(err));
+                        .catch((err) => communicateError(err));
                 }
             } catch (err) {
-                communicateLoginFailure(err);
+                communicateError(err);
             }
         }
         return undefined;
     }
 
-    function communicateLoginFailure(err: unknown): string | undefined {
+    async function startUsernameLogin() {
+        const emailUsername = `${username}@wordplay.dev`;
+        if (auth && usernameSubmittable) {
+            try {
+                await signInWithEmailAndPassword(
+                    auth,
+                    `${username}@wordplay.dev`,
+                    password
+                );
+            } catch (error) {
+                // If not found, then we create the user.
+                if (
+                    error instanceof FirebaseError &&
+                    error.code === 'auth/user-not-found'
+                ) {
+                    try {
+                        await createUserWithEmailAndPassword(
+                            auth,
+                            emailUsername,
+                            password
+                        );
+                    } catch (error) {
+                        communicateError(error);
+                    }
+                }
+                // Otherwise, communicate the error.
+                else communicateError(error);
+            }
+        }
+    }
+
+    function communicateError(err: unknown): string | undefined {
         if (err instanceof FirebaseError) {
             console.error(err.code);
             console.error(err.message);
@@ -118,23 +161,83 @@
         {$locales.get((l) => l.ui.page.login.prompt.login)}
     {/if}
 </p>
-<form on:submit={startLogin}>
+
+<Mode
+    modes={$locales.get((l) => l.ui.page.login.prompt.age.modes)}
+    choice={0}
+    select={(choice) => (younger = choice === 0)}
+    descriptions={$locales.get((l) => l.ui.page.login.prompt.age)}
+/>
+
+{#if missingEmail || !younger}
+    <Subheader>{$locales.get((l) => l.ui.page.login.subheader.email)}</Subheader
+    >
+    <form class="login-form" on:submit={startEmailLogin}>
+        <Note
+            ><MarkupHtmlView
+                inline
+                markup={$locales.get((l) => l.ui.page.login.prompt.emailrules)}
+            /></Note
+        >
+        <div>
+            <TextField
+                kind="email"
+                description={$locales.get(
+                    (l) => l.ui.page.login.field.email.description
+                )}
+                placeholder={$locales.get(
+                    (l) => l.ui.page.login.field.email.placeholder
+                )}
+                bind:text={email}
+                editable={!sent}
+            />
+            <Button
+                submit
+                tip={$locales.get((l) => l.ui.page.login.button.login)}
+                active={emailSubmittable}
+                action={() => undefined}>&gt;</Button
+            >
+        </div>
+    </form>
+{/if}
+<Subheader>{$locales.get((l) => l.ui.page.login.subheader.username)}</Subheader>
+<form class="login-form" on:submit={startUsernameLogin}>
+    <Note
+        ><MarkupHtmlView
+            markup={$locales.get((l) => l.ui.page.login.prompt.usernamerules)}
+        /></Note
+    >
     <TextField
         description={$locales.get(
-            (l) => l.ui.page.login.field.email.description
+            (l) => l.ui.page.login.field.username.description
         )}
         placeholder={$locales.get(
-            (l) => l.ui.page.login.field.email.placeholder
+            (l) => l.ui.page.login.field.username.placeholder
         )}
-        bind:text={email}
+        bind:text={username}
         editable={!sent}
-    /><Button
-        submit
-        tip={$locales.get((l) => l.ui.page.login.button.login)}
-        active={submittable}
-        action={() => undefined}>&gt;</Button
+    />
+    <div>
+        <TextField
+            kind="password"
+            description={$locales.get(
+                (l) => l.ui.page.login.field.password.description
+            )}
+            placeholder={$locales.get(
+                (l) => l.ui.page.login.field.password.placeholder
+            )}
+            bind:text={password}
+            editable={!sent}
+        />
+        <Button
+            submit
+            tip={$locales.get((l) => l.ui.page.login.button.login)}
+            active={usernameSubmittable}
+            action={() => undefined}>&gt;</Button
+        ></div
     >
 </form>
+
 {#if sent === true}
     <Feedback>{$locales.get((l) => l.ui.page.login.prompt.sent)}</Feedback>
 {:else if success === true}
@@ -142,3 +245,14 @@
 {:else if success === false}
     <Feedback>{loginFeedback}</Feedback>
 {/if}
+
+<style>
+    .login-form {
+        display: flex;
+        flex-direction: column;
+        gap: var(--wordplay-spacing);
+        padding: var(--wordplay-spacing);
+        border: var(--wordplay-border-width) solid var(--wordplay-border-color);
+        border-radius: var(--wordplay-border-radius);
+    }
+</style>
diff --git a/src/routes/login/Profile.svelte b/src/routes/login/Profile.svelte
index b3bc93c46..32cf00cb9 100644
--- a/src/routes/login/Profile.svelte
+++ b/src/routes/login/Profile.svelte
@@ -15,6 +15,8 @@
 
     export let user: User;
 
+    $: username = user.email?.endsWith('@wordplay.dev');
+
     let newEmail: string;
 
     let changeSubmitted = false;
@@ -75,13 +77,16 @@
     }
 
     function readyToDeleteAccount(email: string) {
-        return validEmail(email) && email === user.email;
+        const finalEmail = username
+            ? `${confirmEmail}@wordplay.dev`
+            : confirmEmail;
+        return validEmail(finalEmail) && finalEmail === user.email;
     }
 </script>
 
 <Header
     ><span style:font-family="Noto Color Emoji">{user.displayName ?? '😃'}</span
-    >{user.email}</Header
+    >{user.email?.replace('@wordplay.dev', '')}</Header
 >
 
 <div class="actions">
@@ -113,33 +118,36 @@
             ></p
         >
     </div>
-    <div class="action">
-        <p>{$locales.get((l) => l.ui.page.login.prompt.change)}</p>
-        <form on:submit={update}>
-            <TextField
-                description={$locales.get(
-                    (l) => l.ui.page.login.field.email.description
-                )}
-                placeholder={$locales.get(
-                    (l) => l.ui.page.login.field.email.placeholder
-                )}
-                bind:text={newEmail}
-                editable={!changeSubmitted}
-            /><Button
-                submit
-                tip={$locales.get((l) => l.ui.page.login.button.update)}
-                active={validEmail(newEmail)}
-                action={() => undefined}>&gt;</Button
-            >
-            {#if changeSubmitted}<Spinning
-                    label={$locales.get(
-                        (l) => l.ui.page.login.feedback.changing
+    {#if user && !username}
+        <div class="action">
+            <p>{$locales.get((l) => l.ui.page.login.prompt.change)}</p>
+            <form on:submit={update}>
+                <TextField
+                    description={$locales.get(
+                        (l) => l.ui.page.login.field.email.description
                     )}
-                />
-            {:else if changeFeedback}<Feedback inline>{changeFeedback}</Feedback
-                >{/if}
-        </form>
-    </div>
+                    placeholder={$locales.get(
+                        (l) => l.ui.page.login.field.email.placeholder
+                    )}
+                    bind:text={newEmail}
+                    editable={!changeSubmitted}
+                /><Button
+                    submit
+                    tip={$locales.get((l) => l.ui.page.login.button.update)}
+                    active={validEmail(newEmail)}
+                    action={() => undefined}>&gt;</Button
+                >
+                {#if changeSubmitted}<Spinning
+                        label={$locales.get(
+                            (l) => l.ui.page.login.feedback.changing
+                        )}
+                    />
+                {:else if changeFeedback}<Feedback inline
+                        >{changeFeedback}</Feedback
+                    >{/if}
+            </form>
+        </div>
+    {/if}
     <div class="action"
         >{#if !deleteSubmitted}
             <p>{$locales.get((l) => l.ui.page.login.prompt.delete)}</p>
@@ -166,13 +174,18 @@
                             : undefined}
                 >
                     <TextField
-                        description={$locales.get(
-                            (l) => l.ui.page.login.field.email.description
+                        description={$locales.get((l) =>
+                            username
+                                ? l.ui.page.login.field.username.description
+                                : l.ui.page.login.field.email.description
                         )}
-                        placeholder={$locales.get(
-                            (l) => l.ui.page.login.field.email.placeholder
+                        placeholder={$locales.get((l) =>
+                            username
+                                ? l.ui.page.login.field.username.placeholder
+                                : l.ui.page.login.field.email.placeholder
                         )}
                         fill={true}
+                        kind={username ? undefined : 'email'}
                         bind:text={confirmEmail}
                     />
                     <Button
diff --git a/src/routes/login/login.ts b/src/routes/login/login.ts
index 3045fa2de..11cede0b5 100644
--- a/src/routes/login/login.ts
+++ b/src/routes/login/login.ts
@@ -15,5 +15,8 @@ export function getLoginErrorDescription(
             (l) => l.ui.page.login.error.invalid
         ),
         'auth/invalid-email': locales.get((l) => l.ui.page.login.error.email),
+        'auth/wrong-password': locales.get(
+            (l) => l.ui.page.login.error.wrongPassword
+        ),
     }[code];
 }
diff --git a/static/locales/es-MX/es-MX.json b/static/locales/es-MX/es-MX.json
index 2861f1e3e..951c8b1df 100644
--- a/static/locales/es-MX/es-MX.json
+++ b/static/locales/es-MX/es-MX.json
@@ -2554,10 +2554,20 @@
             "login": {
                 "header": "Iniciar sesión",
                 "anonymous": "iniciar sesión",
+                "subheader": {
+                    "email": "$?",
+                    "username": "$?"
+                },
                 "prompt": {
                     "login": "$! Tus actuaciones se están guardando en este dispositivo en vez de en línea. Para guardarlas en línea, envía tu correo electrónico para obtener un enlace de inicio de sesión.",
+                    "age": {
+                        "label": "$?",
+                        "modes": ["$?", "$?"]
+                    },
                     "enter": "Parece que tu enlace de inicio de sesión vino de un navegador o dispositivo diferente. ¿Puedes ingresar tu correo electrónico nuevamente, solo para estar seguros de que eres tú?",
                     "play": "Estás conectado, ¡podemos guardar tus proyectos en línea ahora! ¿Quieres crear algo?",
+                    "emailrules": "$?",
+                    "usernamerules": "$?",
                     "change": "¿Quieres cambiar tu correo electrónico? Envía uno nuevo y te enviaremos una confirmación al antiguo.",
                     "sent": "Revisa tu correo electrónico para encontrar un enlace de inicio de sesión.",
                     "logout": "¿Estás saliendo de un dispositivo compartido y quieres mantener tus proyectos privados? Cierra la sesión y borraremos tus proyectos de este dispositivo. Todavía se almacenarán en línea.",
@@ -2574,7 +2584,8 @@
                     "failure": "No se puede iniciar sesión :(",
                     "offline": "Pareces estar desconectada.",
                     "unchanged": "No pudimos cambiar tu dirección de correo electrónico, pero no sabemos por qué.",
-                    "delete": "No pudimos borrar tu cuenta, pero no sabemos por qué."
+                    "delete": "No pudimos borrar tu cuenta, pero no sabemos por qué.",
+                    "wrongPassword": "$?"
                 },
                 "feedback": {
                     "changing": "Enviando nuevo correo electrónico...",
@@ -2584,6 +2595,14 @@
                     "email": {
                         "description": "editar correo electrónico de inicio de sesión",
                         "placeholder": "correo electrónico"
+                    },
+                    "username": {
+                        "description": "$?",
+                        "placeholder": "$?"
+                    },
+                    "password": {
+                        "description": "$?",
+                        "placeholder": "$?"
                     }
                 },
                 "button": {
diff --git a/static/locales/example/example.json b/static/locales/example/example.json
index 19b7e0240..a8bb6b3e4 100644
--- a/static/locales/example/example.json
+++ b/static/locales/example/example.json
@@ -2495,10 +2495,20 @@
             },
             "login": {
                 "header": "$?",
+                "subheader": {
+                    "email": "$?",
+                    "username": "$?"
+                },
                 "anonymous": "$?",
                 "prompt": {
                     "login": "$?",
+                    "age": {
+                        "label": "$?",
+                        "modes": ["$?", "$?"]
+                    },
                     "enter": "$?",
+                    "emailrules": "$?",
+                    "usernamerules": "$?",
                     "play": "$?",
                     "change": "$?",
                     "logout": "$?",
@@ -2516,7 +2526,8 @@
                     "offline": "$?",
                     "failure": "$?",
                     "unchanged": "$?",
-                    "delete": "$?"
+                    "delete": "$?",
+                    "wrongPassword": "$?"
                 },
                 "feedback": {
                     "changing": "$?",
@@ -2526,6 +2537,14 @@
                     "email": {
                         "description": "$?",
                         "placeholder": "$?"
+                    },
+                    "username": {
+                        "description": "$?",
+                        "placeholder": "$?"
+                    },
+                    "password": {
+                        "description": "$?",
+                        "placeholder": "$?"
                     }
                 },
                 "button": {
diff --git a/static/locales/zh-CN/zh-CN.json b/static/locales/zh-CN/zh-CN.json
index b63edf0cf..50410b46f 100644
--- a/static/locales/zh-CN/zh-CN.json
+++ b/static/locales/zh-CN/zh-CN.json
@@ -2495,10 +2495,20 @@
             },
             "login": {
                 "header": "$?",
+                "subheader": {
+                    "email": "$?",
+                    "username": "$?"
+                },
                 "anonymous": "$?",
                 "prompt": {
                     "login": "$?",
+                    "age": {
+                        "label": "$?",
+                        "modes": ["$?", "$?"]
+                    },
                     "enter": "$?",
+                    "emailrules": "$?",
+                    "usernamerules": "$?",
                     "play": "$?",
                     "change": "$?",
                     "logout": "$?",
@@ -2516,7 +2526,8 @@
                     "offline": "$?",
                     "failure": "$?",
                     "unchanged": "$?",
-                    "delete": "$?"
+                    "delete": "$?",
+                    "wrongPassword": "$?"
                 },
                 "feedback": {
                     "changing": "$?",
@@ -2526,6 +2537,14 @@
                     "email": {
                         "description": "$?",
                         "placeholder": "$?"
+                    },
+                    "username": {
+                        "description": "$?",
+                        "placeholder": "$?"
+                    },
+                    "password": {
+                        "description": "$?",
+                        "placeholder": "$?"
                     }
                 },
                 "button": {
diff --git a/static/schemas/Locale.json b/static/schemas/Locale.json
index aaf17b06f..9f10a6638 100644
--- a/static/schemas/Locale.json
+++ b/static/schemas/Locale.json
@@ -8673,7 +8673,11 @@
                           "type": "string"
                         },
                         "unchanged": {
-                          "description": "When the email addres couldn't be changed for unknown reasons.",
+                          "description": "When the email address couldn't be changed for unknown reasons.",
+                          "type": "string"
+                        },
+                        "wrongPassword": {
+                          "description": "When a password is wrong",
                           "type": "string"
                         }
                       },
@@ -8684,7 +8688,8 @@
                         "failure",
                         "offline",
                         "unchanged",
-                        "delete"
+                        "delete",
+                        "wrongPassword"
                       ],
                       "type": "object"
                     },
@@ -8712,10 +8717,20 @@
                         "email": {
                           "$ref": "#/definitions/FieldText",
                           "description": "The login email"
+                        },
+                        "password": {
+                          "$ref": "#/definitions/FieldText",
+                          "description": "The login password"
+                        },
+                        "username": {
+                          "$ref": "#/definitions/FieldText",
+                          "description": "The login username"
                         }
                       },
                       "required": [
-                        "email"
+                        "email",
+                        "username",
+                        "password"
                       ],
                       "type": "object"
                     },
@@ -8726,6 +8741,10 @@
                     "prompt": {
                       "additionalProperties": false,
                       "properties": {
+                        "age": {
+                          "$ref": "#/definitions/ModeText%3C%5Bstring%2Cstring%5D%3E",
+                          "description": "Text for age prompt"
+                        },
                         "change": {
                           "description": "Tells the creator that they can change their email address.",
                           "type": "string"
@@ -8738,6 +8757,10 @@
                           "description": "Offers to delete account",
                           "type": "string"
                         },
+                        "emailrules": {
+                          "description": "Gives rules for emails above the login form",
+                          "type": "string"
+                        },
                         "enter": {
                           "description": "Asks the creator to enter their email if they opened the email link in a different browser.",
                           "type": "string"
@@ -8769,6 +8792,10 @@
                         "success": {
                           "description": "Shown briefly before page redirects to projects",
                           "type": "string"
+                        },
+                        "usernamerules": {
+                          "description": "Gives rules for usernames and passwords above the login form",
+                          "type": "string"
                         }
                       },
                       "required": [
@@ -8777,18 +8804,40 @@
                         "change",
                         "enter",
                         "play",
+                        "emailrules",
+                        "usernamerules",
                         "logout",
                         "success",
                         "confirm",
                         "delete",
                         "reallyDelete",
-                        "name"
+                        "name",
+                        "age"
+                      ],
+                      "type": "object"
+                    },
+                    "subheader": {
+                      "additionalProperties": false,
+                      "properties": {
+                        "email": {
+                          "description": "Header for logging in via email",
+                          "type": "string"
+                        },
+                        "username": {
+                          "description": "Header for logging in via username and password",
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "email",
+                        "username"
                       ],
                       "type": "object"
                     }
                   },
                   "required": [
                     "header",
+                    "subheader",
                     "prompt",
                     "anonymous",
                     "field",