diff --git a/src/AdminUI.css b/src/AdminUI.css
index 0c75396..4ecec97 100644
--- a/src/AdminUI.css
+++ b/src/AdminUI.css
@@ -250,3 +250,6 @@ dialog > div label {
     text-align: center;
   }
 }
+#dialog-edit-user input.invalid {
+    color: red;
+}
diff --git a/src/AdminUI.tsx b/src/AdminUI.tsx
index 07cc139..e6ad0c5 100644
--- a/src/AdminUI.tsx
+++ b/src/AdminUI.tsx
@@ -1,7 +1,7 @@
 import React, { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
 import './AdminUI.css';
 import { createGuestRequest, createPartyRequest, deleteGuestRequest, deletePartyRequest, listGuestsRequest, listPartyRequest, modifyGuestRequest, parseToken, setAllowedExtras } from './partyAdminApi';
-import { GrammaticalGender, Person, RequestCreateGuest, ResponseCreateParty, ResponseListGuests, ResponseListParties } from './partyAdminApiTypes';
+import { GrammaticalGender, Person, RequestCreateGuest, ResponseCreateParty, ResponseListGuests, ResponseListParties, AllowedExtraLengths } from './partyAdminApiTypes';
 
 export const AdminUI: React.FC = () => {
 
@@ -92,7 +92,7 @@ export const AdminUI: React.FC = () => {
         if (adminToken === "") return;
         loadPartyList();
     }, [adminToken, loadPartyList]);
-    
+
     return <>
         {editUserData || editingParty ?
             <div id="backdrop" onClick={dismissBackdrop} />
@@ -120,7 +120,7 @@ export const AdminUI: React.FC = () => {
             <div>
                 {editUserData ?
                     <>
-                        <span className="lg">{"_id" in editUserData ? `Editing ${editUserData.name}` : "New Invitation"}</span>
+                        <h1>{"_id" in editUserData ? `Editing ${editUserData.name}` : "New Invitation"}</h1>
                         <div className="dialog-person-table">
                             <label htmlFor="edit-token">Token</label>
                             <input type="text" id="edit-token" value={editUserData.token} onChange={(e) => { setEditUserData({ ...editUserData, token: e.target.value }) }} />
@@ -145,6 +145,9 @@ export const AdminUI: React.FC = () => {
                                 <option value="f">f</option>
                                 <option value="d">d</option>
                             </select>
+                            {selectedParty !== undefined && partyList[selectedParty] ? 
+                                <ExtraDataTable value={editUserData} setEditUserData={setEditUserData} allowed_extra={partyList[selectedParty].allowed_extra} />
+                                :null}
                         </div>
                     </>
                     : "Hab keine user data bekommen."}
@@ -183,6 +186,23 @@ export const AdminUI: React.FC = () => {
     </>
 };
 
+export const ExtraDataTable : React.FC<{
+    value: RequestCreateGuest | Person,
+    setEditUserData: React.Dispatch<React.SetStateAction<RequestCreateGuest | Person | undefined>>,
+    allowed_extra: AllowedExtraLengths }
+    > = ({value: editUserData, setEditUserData, allowed_extra}) => {
+    return <>
+        <h2 style={{gridColumn:"1/span 2", textAlign: "center"}} >Extras</h2>
+
+                {Object.entries(allowed_extra).map(([extra, maxLen], index) => 
+                    <>
+                        <label key={`extra-${extra}-label`} htmlFor={`edit-extra-${extra}`}>{extra}</label>
+                        <input className={((editUserData.extra[extra]??"").length > maxLen ? "invalid" : "")} key={`extra-${extra}-input` }  type="text" id={`edit-extra-${extra}`} value={editUserData.extra[extra]} onChange={(e) => { setEditUserData({ ...editUserData, extra: {...editUserData.extra, [extra]: e.target.value}}) }} />
+                    </>
+                )}
+    </>;
+}
+
 export const PartyUI: React.FC<{ party: ResponseCreateParty, adminToken: string, editUser: (user: RequestCreateGuest) => void }> = ({ party, adminToken, editUser }) => {
     const [guests, setGuests] = useState<ResponseListGuests>([]);
 
@@ -233,8 +253,8 @@ export const PartyUI: React.FC<{ party: ResponseCreateParty, adminToken: string,
                     <span>{confirmations[2]}</span>
                 </div></div>
                 { hasExtras ? 
-                  <div className="header"><span className="lg">Extras</span><div className="extraTable heading" style={{"--num-columns": numExtraColumns} as React.CSSProperties}>{Object.keys(party.allowed_extra).map((k,i) => <div key={i}>{k}</div>)}</div></div>
-                  :null
+                    <div className="header"><span className="lg">Extras</span><div className="extraTable heading" style={{"--num-columns": numExtraColumns} as React.CSSProperties}>{Object.keys(party.allowed_extra).map((k,i) => <div key={i}>{k}</div>)}</div></div>
+                    :null
                 }
                 {guests.map((guest, index) => <Fragment key={index}>
                     <div className="guestname" onContextMenu={(e) => { e.preventDefault(); exportPartyLink(guest); }} onClick={() => editUser(guest)}>{guest.token}</div>
@@ -242,8 +262,8 @@ export const PartyUI: React.FC<{ party: ResponseCreateParty, adminToken: string,
                     <div onContextMenu={(e) => { e.preventDefault(); exportPartyLink(guest); }} onClick={() => editUser(guest)}>{guest.grammatical_gender}</div>
                     <div onContextMenu={(e) => { e.preventDefault(); exportPartyLink(guest); }} onClick={() => editUser(guest)}>{guest.coming ?? "?"}</div>
                     {hasExtras ?
-                      <div ><ExtraTable party={party} guest={guest} onContextMenu={(e) => { e.preventDefault(); exportPartyLink(guest); }} onClick={() => editUser(guest)}/></div>
-                    : null}
+                        <div ><ExtraTable party={party} guest={guest} onContextMenu={(e) => { e.preventDefault(); exportPartyLink(guest); }} onClick={() => editUser(guest)}/></div>
+                        : null}
                 </Fragment>
                 )}
             </div>
@@ -261,10 +281,10 @@ export const PartyUI: React.FC<{ party: ResponseCreateParty, adminToken: string,
 };
 
 export const ExtraTable : React.FC<{guest: Person, party: ResponseCreateParty} & React.HTMLProps<HTMLDivElement>> = ({guest, party}) => {
-  const numExtraColumns = Object.keys(party.allowed_extra).length;
-  return <div className="extraTable" style={{"--num-columns": numExtraColumns} as React.CSSProperties}>
-    {Object.keys(party.allowed_extra).map((k, i) => <div key={i}>
-                                          {guest.extra[k]?? ""}
-                                          </div>)}
-  </div>
+    const numExtraColumns = Object.keys(party.allowed_extra).length;
+    return <div className="extraTable" style={{"--num-columns": numExtraColumns} as React.CSSProperties}>
+        {Object.keys(party.allowed_extra).map((k, i) => <div key={i}>
+            {guest.extra[k]?? ""}
+        </div>)}
+    </div>
 }