diff --git a/apps/client/src/setup.css b/apps/client/src/setup.css
index d373ff19c7..106794bdff 100644
--- a/apps/client/src/setup.css
+++ b/apps/client/src/setup.css
@@ -247,8 +247,7 @@ body.setup {
         text-align: center;
         color: var(--muted-text-color);
         opacity: 0.6;
-        margin-top: 2rem;
-        margin-bottom: 1rem;
+        margin-block: 1rem;
     }
 
     .illustration-logo {
diff --git a/apps/client/src/setup.tsx b/apps/client/src/setup.tsx
index dcd4f877e3..10b648cbc6 100644
--- a/apps/client/src/setup.tsx
+++ b/apps/client/src/setup.tsx
@@ -35,7 +35,7 @@ const STATE_ORDER: State[] = ["selectLanguage", "firstOptions", "createNewDocume
 
 function renderState(state: State, setState: (state: State) => void) {
     switch (state) {
-        case "selectLanguage": return <SelectLanguage />;
+        case "selectLanguage": return <SelectLanguage setState={setState} />;
         case "firstOptions": return <SetupOptions setState={setState} />;
         case "createNewDocumentOptions": return <CreateNewDocumentOptions setState={setState} />;
         case "createNewDocumentWithDemo": return <CreateNewDocumentInProgress withDemo />;
@@ -84,18 +84,17 @@ function App() {
     );
 }
 
-function SelectLanguage() {
+function SelectLanguage({ setState }: { setState: (state: State) => void }) {
     const [ currentLocale, setCurrentLocale ] = useState("en");
     const filteredLocales = useMemo(() => LOCALES.filter(l => !l.contentOnly), []);
     const { t, i18n } = useTranslation();
-    console.log("Rendering with ", currentLocale, t("setup.language"));
 
     return (
         <SetupPage
             title={t("setup.language")}
             className="select-language"
             illustration={<Icon icon="bx bx-globe" className="illustration-icon" />}
-            footer={<Button text={t("setup.continue")} kind="primary" />}
+            footer={<Button text={t("setup.continue")} kind="primary" onClick={() => setState("firstOptions")} />}
         >
             <FormList onSelect={async (id) => {
                 await i18n.changeLanguage(id);
@@ -115,6 +114,7 @@ function SetupOptions({ setState }: { setState: (state: State) => void }) {
             title={t("setup.heading")}
             className="setup-options-container"
             illustration={<img src={logo} alt="Setup illustration" className="illustration-logo" />}
+            onBack={() => setState("selectLanguage")}
         >
             <div class="setup-options centered">
                 <SetupOptionCard