diff --git a/app/src/Create.js b/app/src/Create.js
index 0358268..ee70e04 100644
--- a/app/src/Create.js
+++ b/app/src/Create.js
@@ -49,8 +49,8 @@ export default class Create extends Component {
     const defaultMode = LocalData().partyName ? 'join' : 'create';
     this.state = {
       userName: LocalData().userName || '',
-      name: '',
-      pin: '',
+      name: LocalData().partyName || '',
+      pin: LocalData().partyPin || '',
       mode: defaultMode,
       parties: [],
       adminOnly: false,
@@ -246,8 +246,8 @@ export default class Create extends Component {
             getOptionLabel={o => o.name}
             autoComplete
             freeSolo
-            inputValue={name}
-            onInputChange={(e, v, r) => this.partyNameAutocompleteProcessor(v)}
+            value={{name:name, pin: pin}}
+            onInputChange={(e,v,r) => this.partyNameAutocompleteProcessor({name: v, pin: pin})}
             onChange={(e, v) => this.partyNameAutocompleteProcessor(v)}
             renderInput={(params) =>
               <TextField
diff --git a/app/src/index.css b/app/src/index.css
index 4e11478..e61f70e 100644
--- a/app/src/index.css
+++ b/app/src/index.css
@@ -618,4 +618,5 @@ body.amazon-prime .notification-switch .MuiSwitch-thumb {
 
 .admin-only-switch {
   margin-bottom: 20px !important;
+  color: white !important;
 }
\ No newline at end of file