diff --git a/src/components/CompanySettingsDialog.jsx b/src/components/CompanySettingsDialog.jsx
index 69c7322..5a443ee 100644
--- a/src/components/CompanySettingsDialog.jsx
+++ b/src/components/CompanySettingsDialog.jsx
@@ -3,7 +3,6 @@ import { connect } from 'react-redux';
 import Alert from '@mui/material/Alert';
 import Box from '@mui/material/Box';
 import Button from '@mui/material/Button';
-import CircularProgress from '@mui/material/CircularProgress';
 import Dialog from '@mui/material/Dialog';
 import DialogActions from '@mui/material/DialogActions';
 import DialogContent from '@mui/material/DialogContent';
@@ -28,18 +27,15 @@ import { enqueueSnackbar } from 'notistack';
 import BackendError from './BackendError';
 import SingleLineTextEdit from './SingleLineTextEdit';
 import { StorageManagerContext } from '../api/storageManager';
-import {
-  loadCurrentCompany,
-  selectCompanyStatus,
-  selectCurrentCompany,
-  updateCompany as updateCompanyThunk,
-} from '../store/companySlice';
+import { selectAuthUser } from '../store/authSlice';
+import { updateCompany as updateCompanyThunk } from '../store/companySlice';
 import {
   createPosterminal,
   deletePosterminal,
   enableAllTerminalCategories,
 } from '../store/posterminalSlice';
 import { loadCategoryTree } from '../store/categorySlice';
+import { requireDefined } from '../utils/apiShape';
 import { ISO639_OPTIONS, parseTaxRate } from '../utils/companyForm';
 import { backendErrorFrom, isBackendFailure } from '../utils/backendError';
 import { notifyError } from '../utils/notify';
@@ -65,34 +61,45 @@ class CompanySettingsDialog extends Component {
     this.syncFormFromCompany = this.syncFormFromCompany.bind(this);
     this.handleCreateTerminal = this.handleCreateTerminal.bind(this);
     this.handleDeleteTerminal = this.handleDeleteTerminal.bind(this);
+    this.loadCompany = this.loadCompany.bind(this);
     this.loadTerminals = this.loadTerminals.bind(this);
   }
 
   componentDidUpdate(prevProps) {
-    const { open, company, companyStatus } = this.props;
+    const { open } = this.props;
     if (open && !prevProps.open) {
       this.setState({ error: null });
-      if (company) {
-        this.syncFormFromCompany(company);
-      } else if (companyStatus !== 'loading') {
-        void this.props.loadCurrentCompany();
-      }
+      void this.loadCompany();
       void this.loadTerminals();
     }
-    if (open && company && company !== prevProps.company) {
-      this.syncFormFromCompany(company);
-    }
   }
 
   syncFormFromCompany(company) {
     this.setState({
-      name: company.name ?? '',
+      name: company.name,
       iso639: company.iso639,
       taxrate: company.taxrate != null ? String(company.taxrate) : '',
       reducedtaxrate: company.reducedtaxrate != null ? String(company.reducedtaxrate) : '',
     });
   }
 
+  async loadCompany() {
+    try {
+      const companyId = requireDefined(
+        this.props.selectedCompanyId,
+        'selectedCompanyId',
+      );
+      const companies = await this.context.companyPromise;
+      const company = requireDefined(
+        companies.find((c) => c.id === companyId),
+        'company',
+      );
+      this.syncFormFromCompany(company);
+    } catch (err) {
+      notifyError(err);
+    }
+  }
+
   async loadTerminals() {
     try {
       const terminals = await this.context.posterminalPromise;
@@ -156,13 +163,14 @@ class CompanySettingsDialog extends Component {
     this.setState({ busy: true, error: null });
     try {
       await this.props
-        .updateCompany({
+        .saveCompany({
           name: name.trim(),
           iso639,
           taxrate: parsedTaxrate,
           reducedtaxrate: parsedReducedtaxrate,
         })
         .unwrap();
+      await this.context.updateCompany();
       enqueueSnackbar('Unternehmen gespeichert.', { variant: 'success' });
       onClose();
     } catch (err) {
@@ -173,9 +181,8 @@ class CompanySettingsDialog extends Component {
   }
 
   render() {
-    const { open, onClose, companyStatus } = this.props;
+    const { open, onClose } = this.props;
     const { busy, error, name, iso639, taxrate, reducedtaxrate } = this.state;
-    const loading = companyStatus === 'loading' && !busy;
     const parsedTaxrate = parseTaxRate(taxrate);
     const parsedReducedtaxrate = parseTaxRate(reducedtaxrate);
     const canSave =
@@ -199,148 +206,142 @@ class CompanySettingsDialog extends Component {
               )
             ) : null}
 
-            {loading ? (
-              <Box sx={{ display: 'flex', justifyContent: 'center', py: 4 }}>
-                <CircularProgress />
-              </Box>
-            ) : (
-              <Stack spacing={2}>
-                <SingleLineTextEdit
+            <Stack spacing={2}>
+              <SingleLineTextEdit
+                required
+                size="small"
+                label="Name"
+                value={name}
+                disabled={busy}
+                onChange={(nextName) => this.setState({ name: nextName })}
+                autoComplete="off"
+                autoFocus
+              />
+
+              <FormControl required>
+                <FormLabel sx={{ mb: 0.5 }}>Sprache</FormLabel>
+                <ToggleButtonGroup
+                  exclusive
                   required
                   size="small"
-                  label="Name"
-                  value={name}
+                  value={iso639}
                   disabled={busy}
-                  onChange={(nextName) => this.setState({ name: nextName })}
-                  autoComplete="off"
-                  autoFocus
+                  onChange={(_event, value) => {
+                    if (value) this.setState({ iso639: value });
+                  }}
+                >
+                  <ToggleButton value="de">Deutsch</ToggleButton>
+                  <ToggleButton value="en">English</ToggleButton>
+                </ToggleButtonGroup>
+              </FormControl>
+
+              <Stack direction="row" spacing={1}>
+                <TextField
+                  fullWidth
+                  required
+                  size="small"
+                  type="number"
+                  label="Normalsatz"
+                  value={taxrate}
+                  disabled={busy}
+                  onChange={(e) => this.setState({ taxrate: e.target.value })}
+                  error={taxrate !== '' && parsedTaxrate == null}
+                  slotProps={{
+                    input: {
+                      endAdornment: <InputAdornment position="end">%</InputAdornment>,
+                    },
+                    htmlInput: { min: 0, max: 100, step: 0.01, required: true },
+                  }}
+                />
+                <TextField
+                  fullWidth
+                  required
+                  size="small"
+                  type="number"
+                  label="Ermäßigter Satz"
+                  value={reducedtaxrate}
+                  disabled={busy}
+                  onChange={(e) => this.setState({ reducedtaxrate: e.target.value })}
+                  error={reducedtaxrate !== '' && parsedReducedtaxrate == null}
+                  slotProps={{
+                    input: {
+                      endAdornment: <InputAdornment position="end">%</InputAdornment>,
+                    },
+                    htmlInput: { min: 0, max: 100, step: 0.01, required: true },
+                  }}
                 />
-
-                <FormControl required>
-                  <FormLabel sx={{ mb: 0.5 }}>Sprache</FormLabel>
-                  <ToggleButtonGroup
-                    exclusive
-                    required
-                    size="small"
-                    value={iso639}
-                    disabled={busy}
-                    onChange={(_event, value) => {
-                      if (value) this.setState({ iso639: value });
-                    }}
-                  >
-                    <ToggleButton value="de">Deutsch</ToggleButton>
-                    <ToggleButton value="en">English</ToggleButton>
-                  </ToggleButtonGroup>
-                </FormControl>
-
-                <Stack direction="row" spacing={1}>
-                  <TextField
-                    fullWidth
-                    required
-                    size="small"
-                    type="number"
-                    label="Normalsatz"
-                    value={taxrate}
-                    disabled={busy}
-                    onChange={(e) => this.setState({ taxrate: e.target.value })}
-                    error={taxrate !== '' && parsedTaxrate == null}
-                    slotProps={{
-                      input: {
-                        endAdornment: <InputAdornment position="end">%</InputAdornment>,
-                      },
-                      htmlInput: { min: 0, max: 100, step: 0.01, required: true },
-                    }}
-                  />
-                  <TextField
-                    fullWidth
-                    required
-                    size="small"
-                    type="number"
-                    label="Ermäßigter Satz"
-                    value={reducedtaxrate}
-                    disabled={busy}
-                    onChange={(e) => this.setState({ reducedtaxrate: e.target.value })}
-                    error={reducedtaxrate !== '' && parsedReducedtaxrate == null}
-                    slotProps={{
-                      input: {
-                        endAdornment: <InputAdornment position="end">%</InputAdornment>,
-                      },
-                      htmlInput: { min: 0, max: 100, step: 0.01, required: true },
-                    }}
-                  />
-                </Stack>
-
-                <Divider sx={{ my: 1 }} />
-
-                <Box>
-                  <List dense sx={{ py: 0 }}>
-                    {this.state.terminals.map((terminal) => (
-                      <ListItem
-                        key={terminal.id}
-                        sx={{ px: 0, py: 0.5 }}
-                      >
-                        <PointOfSaleIcon sx={{ mr: 1, color: 'text.secondary', fontSize: 20 }} />
-                        <ListItemText
-                          primary={terminal.name}
-                          secondary={`PIN: ${terminal.pairingpin}`}
-                        />
-                        <ListItemSecondaryAction>
-                          <IconButton
-                            edge="end"
-                            size="small"
-                            onClick={() => this.handleDeleteTerminal(terminal)}
-                            disabled={busy || this.state.creatingTerminal}
-                          >
-                            <DeleteOutlinedIcon fontSize="small" />
-                          </IconButton>
-                        </ListItemSecondaryAction>
-                      </ListItem>
-                    ))}
-                  </List>
-
-                  <Box sx={{ mt: 1, display: 'flex', alignItems: 'center', gap: 1 }}>
-                    <TextField
-                      size="small"
-                      placeholder="Neues Terminal..."
-                      value={this.state.newTerminalName}
-                      onChange={(e) => this.setState({ newTerminalName: e.target.value })}
-                      disabled={busy || this.state.creatingTerminal}
-                      autoComplete="off"
-                      onKeyDown={(e) => {
-                        if (e.key === 'Enter') {
-                          e.preventDefault();
-                          this.handleCreateTerminal();
-                        }
-                      }}
-                      sx={{ flex: 1 }}
-                    />
-                    <Box sx={{ display: 'flex', alignItems: 'center', gap: 0.5 }}>
-                      <PointOfSaleIcon sx={{ fontSize: 18, color: 'text.secondary' }} />
-                      <Switch
-                        size="small"
-                        checked={this.state.enableAllForNew}
-                        onChange={(e) => this.setState({ enableAllForNew: e.target.checked })}
-                        disabled={busy || this.state.creatingTerminal}
-                      />
-                    </Box>
-                    <Button
-                      variant="contained"
-                      size="small"
-                      onClick={this.handleCreateTerminal}
-                      disabled={busy || this.state.creatingTerminal || !this.state.newTerminalName.trim()}
-                    >
-                      Hinzufügen
-                    </Button>
-                  </Box>
-                </Box>
               </Stack>
-            )}
+
+              <Divider sx={{ my: 1 }} />
+
+              <Box>
+                <List dense sx={{ py: 0 }}>
+                  {this.state.terminals.map((terminal) => (
+                    <ListItem
+                      key={terminal.id}
+                      sx={{ px: 0, py: 0.5 }}
+                    >
+                      <PointOfSaleIcon sx={{ mr: 1, color: 'text.secondary', fontSize: 20 }} />
+                      <ListItemText
+                        primary={terminal.name}
+                        secondary={`PIN: ${terminal.pairingpin}`}
+                      />
+                      <ListItemSecondaryAction>
+                        <IconButton
+                          edge="end"
+                          size="small"
+                          onClick={() => this.handleDeleteTerminal(terminal)}
+                          disabled={busy || this.state.creatingTerminal}
+                        >
+                          <DeleteOutlinedIcon fontSize="small" />
+                        </IconButton>
+                      </ListItemSecondaryAction>
+                    </ListItem>
+                  ))}
+                </List>
+
+                <Box sx={{ mt: 1, display: 'flex', alignItems: 'center', gap: 1 }}>
+                  <TextField
+                    size="small"
+                    placeholder="Neues Terminal..."
+                    value={this.state.newTerminalName}
+                    onChange={(e) => this.setState({ newTerminalName: e.target.value })}
+                    disabled={busy || this.state.creatingTerminal}
+                    autoComplete="off"
+                    onKeyDown={(e) => {
+                      if (e.key === 'Enter') {
+                        e.preventDefault();
+                        this.handleCreateTerminal();
+                      }
+                    }}
+                    sx={{ flex: 1 }}
+                  />
+                  <Box sx={{ display: 'flex', alignItems: 'center', gap: 0.5 }}>
+                    <PointOfSaleIcon sx={{ fontSize: 18, color: 'text.secondary' }} />
+                    <Switch
+                      size="small"
+                      checked={this.state.enableAllForNew}
+                      onChange={(e) => this.setState({ enableAllForNew: e.target.checked })}
+                      disabled={busy || this.state.creatingTerminal}
+                    />
+                  </Box>
+                  <Button
+                    variant="contained"
+                    size="small"
+                    onClick={this.handleCreateTerminal}
+                    disabled={busy || this.state.creatingTerminal || !this.state.newTerminalName.trim()}
+                  >
+                    Hinzufügen
+                  </Button>
+                </Box>
+              </Box>
+            </Stack>
           </DialogContent>
           <DialogActions sx={{ px: 3, pb: 2 }}>
             <Button onClick={onClose} disabled={busy}>
               Abbrechen
             </Button>
-            <Button type="submit" variant="contained" disabled={busy || loading || !canSave}>
+            <Button type="submit" variant="contained" disabled={busy || !canSave}>
               Speichern
             </Button>
           </DialogActions>
@@ -351,13 +352,11 @@ class CompanySettingsDialog extends Component {
 }
 
 const mapStateToProps = (state) => ({
-  company: selectCurrentCompany(state),
-  companyStatus: selectCompanyStatus(state),
+  selectedCompanyId: selectAuthUser(state)?.selectedCompanyId,
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  loadCurrentCompany: () => dispatch(loadCurrentCompany()),
-  updateCompany: (payload) => dispatch(updateCompanyThunk(payload)),
+  saveCompany: (payload) => dispatch(updateCompanyThunk(payload)),
   createPosterminal: (payload) => dispatch(createPosterminal(payload)),
   deletePosterminal: (payload) => dispatch(deletePosterminal(payload)),
   enableAllTerminalCategories: (payload) => dispatch(enableAllTerminalCategories(payload)),