diff --git a/dashboard/public/js/index.js b/dashboard/public/js/index.js
index cce21f916..7fd604ae7 100644
--- a/dashboard/public/js/index.js
+++ b/dashboard/public/js/index.js
@@ -97,8 +97,8 @@ app.config(['$routeProvider', function ($routeProvider) {
     }).when('/oidc', {
         redirectTo: '/user-directory'
     }).when('/settings', {
-        controller: 'SettingsController',
-        templateUrl: 'views/settings.html?' + window.VITE_CACHE_ID
+        // controller: 'SettingsController',
+        // templateUrl: 'views/settings.html?' + window.VITE_CACHE_ID
     }).when('/eventlog', {
         controller: 'EventLogController',
         templateUrl: 'views/eventlog.html?' + window.VITE_CACHE_ID
diff --git a/dashboard/src/Index.vue b/dashboard/src/Index.vue
index 6e8fd9368..f45f8edb3 100644
--- a/dashboard/src/Index.vue
+++ b/dashboard/src/Index.vue
@@ -7,6 +7,7 @@ import AppstoreView from './views/AppstoreView.vue';
 import NetworkView from './views/NetworkView.vue';
 import ProfileView from './views/ProfileView.vue';
 import ServicesView from './views/ServicesView.vue';
+import SettingsView from './views/SettingsView.vue';
 import SupportView from './views/SupportView.vue';
 import UserDirectoryView from './views/UserDirectoryView.vue';
 import VolumesView from './views/VolumesView.vue';
@@ -20,8 +21,9 @@ const VIEWS = {
   APPSTORE: 'appstore',
   NETWORK: 'network',
   PROFILE: 'profile',
-  SUPPORT: 'support',
   SERVICES: 'services',
+  SETTINGS: 'settings',
+  SUPPORT: 'support',
   USER_DIRECTORY: 'user-directory',
   VOLUMES: 'volumes',
 };
@@ -34,8 +36,9 @@ export default {
     NetworkView,
     Notification,
     ProfileView,
-    SupportView,
     ServicesView,
+    SettingsView,
+    SupportView,
     UserDirectoryView,
     VolumesView,
   },
@@ -72,6 +75,8 @@ export default {
         that.view = VIEWS.PROFILE;
       } else if (view === VIEWS.SERVICES) {
         that.view = VIEWS.SERVICES;
+      } else if (view === VIEWS.SETTINGS) {
+        that.view = VIEWS.SETTINGS;
       } else if (view === VIEWS.SUPPORT) {
         that.view = VIEWS.SUPPORT;
       }  else if (view === VIEWS.USER_DIRECTORY) {
@@ -102,6 +107,7 @@ export default {
     <NetworkView v-else-if="view === VIEWS.NETWORK" />
     <ProfileView v-else-if="view === VIEWS.PROFILE" />
     <ServicesView v-else-if="view === VIEWS.SERVICES" />
+    <SettingsView v-else-if="view === VIEWS.SETTINGS" />
     <SupportView v-else-if="view === VIEWS.SUPPORT" />
     <UserDirectoryView v-else-if="view === VIEWS.USER_DIRECTORY" />
     <VolumesView v-else-if="view === VIEWS.VOLUMES" />
diff --git a/dashboard/src/components/SystemUpdate.vue b/dashboard/src/components/SystemUpdate.vue
new file mode 100644
index 000000000..4a121b8f1
--- /dev/null
+++ b/dashboard/src/components/SystemUpdate.vue
@@ -0,0 +1,21 @@
+<script setup>
+
+import { ref } from 'vue';
+import { Button } from 'pankow';
+import Section from '../components/Section.vue';
+
+const taskLogsMenu = ref([]);
+
+</script>
+
+<template>
+  <div>
+    <Section :title="$t('settings.updates.title')">
+      <template #header-buttons>
+        <Button tool icon="fas fa-align-left" v-tooltip="$t('settings.updates.showLogsAction')" :menu="taskLogsMenu" :disabled="!taskLogsMenu.length"/>
+      </template>
+
+      <p v-html="$t('settings.updates.description')"></p>
+    </Section>
+  </div>
+</template>
diff --git a/dashboard/src/models/CloudronModel.js b/dashboard/src/models/CloudronModel.js
index e0e92cb39..5250e8236 100644
--- a/dashboard/src/models/CloudronModel.js
+++ b/dashboard/src/models/CloudronModel.js
@@ -12,12 +12,52 @@ function create(origin, accessToken) {
         error = e;
       }
 
-      if (error || result.status !== 200) {
-        console.error('Failed to get languages.', error || result.status);
-        return [];
+      if (error || result.status !== 200) return [error || result];
+      return [null, result.body.languages];
+    },
+    async getLanguage() {
+      let error, result;
+      try {
+        result = await fetcher.get(`${origin}/api/v1/cloudron/language`, { access_token: accessToken });
+      } catch (e) {
+        error = e;
       }
 
-      return result.body.languages;
+      if (error || result.status !== 200) return [error || result];
+      return [null, result.body.language];
+    },
+    async setLanguage(language) {
+      let error, result;
+      try {
+        result = await fetcher.post(`${origin}/api/v1/cloudron/language`, { language }, { access_token: accessToken });
+      } catch (e) {
+        error = e;
+      }
+
+      if (error || result.status !== 200) return [error || result];
+      return [null];
+    },
+    async getTimeZone() {
+      let error, result;
+      try {
+        result = await fetcher.get(`${origin}/api/v1/cloudron/time_zone`, { access_token: accessToken });
+      } catch (e) {
+        error = e;
+      }
+
+      if (error || result.status !== 200) return [error || result];
+      return [null, result.body.timeZone];
+    },
+    async setTimeZone(timeZone) {
+      let error, result;
+      try {
+        result = await fetcher.post(`${origin}/api/v1/cloudron/time_zone`, { timeZone }, { access_token: accessToken });
+      } catch (e) {
+        error = e;
+      }
+
+      if (error || result.status !== 200) return [error || result];
+      return [null];
     },
   };
 }
diff --git a/dashboard/src/views/ProfileView.vue b/dashboard/src/views/ProfileView.vue
index cfe4498cc..1884a96a6 100644
--- a/dashboard/src/views/ProfileView.vue
+++ b/dashboard/src/views/ProfileView.vue
@@ -204,8 +204,8 @@ async function onTwoFADisable() {
 onMounted(async () => {
   user.value = await profileModel.get();
 
-  const langs = await cloudronModel.languages();
-  languages.value = langs.map(l => {
+  let [error, result] = await cloudronModel.languages();
+  languages.value = result.map(l => {
     return {
       id: l,
       display: t(`lang.${l}`)
@@ -217,12 +217,12 @@ onMounted(async () => {
   const usedLang = window.localStorage.NG_TRANSLATE_LANG_KEY || 'en';
   language.value = languages.value.find(l => l.id === usedLang).id;
 
-  const [error, tokens] = await tokensModel.list();
+  [error, result] = await tokensModel.list();
   if (error) return console.error(error);
 
   // dashboard and development clientIds were issued with 7.5.0
-  webadminTokens.value = tokens.filter(function (c) { return c.clientId === TOKEN_TYPES.ID_WEBADMIN || c.clientId === TOKEN_TYPES.ID_DEVELOPMENT || c.clientId === 'dashboard' || c.clientId === 'development'; });
-  cliTokens.value = tokens.filter(function (c) { return c.clientId === TOKEN_TYPES.ID_CLI; });
+  webadminTokens.value = result.filter(function (c) { return c.clientId === TOKEN_TYPES.ID_WEBADMIN || c.clientId === TOKEN_TYPES.ID_DEVELOPMENT || c.clientId === 'dashboard' || c.clientId === 'development'; });
+  cliTokens.value = result.filter(function (c) { return c.clientId === TOKEN_TYPES.ID_CLI; });
 });
 
 </script>
diff --git a/dashboard/src/views/SettingsView.vue b/dashboard/src/views/SettingsView.vue
new file mode 100644
index 000000000..27fcc3e49
--- /dev/null
+++ b/dashboard/src/views/SettingsView.vue
@@ -0,0 +1,111 @@
+<script setup>
+
+const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
+
+import { useI18n } from 'vue-i18n';
+const i18n = useI18n();
+const t = i18n.t;
+
+import { ref, onMounted, watch } from 'vue';
+import { Dropdown } from 'pankow';
+import Section from '../components/Section.vue';
+import SystemUpdate from '../components/SystemUpdate.vue';
+import CloudronModel from '../models/CloudronModel.js';
+
+const cloudronModel = CloudronModel.create(API_ORIGIN, localStorage.token);
+
+// Timezone
+const allTimezones = window.timezones;
+const timeZone = ref('');
+const currentTimeZone = ref('');
+
+function prettyTimeZone(timeZone) {
+  const tz = window.timezones.find(function (t) { return t.id === timeZone; });
+  if (!tz) return '';
+  return tz.display;
+}
+
+watch(timeZone, async (newTimeZone, oldTimeZone) => {
+  if (!oldTimeZone) return;
+
+  const [error] = await cloudronModel.setTimeZone(newTimeZone);
+  if (error) {
+    console.error(error);
+    window.pankow.notify({ text: 'Failed to set timezone. Check logs', type: 'danger' });
+    timeZone.value = currentTimeZone.value;
+  } else {
+    currentTimeZone.value = newTimeZone;
+    window.pankow.notify({ text: 'Timezone changed', type: 'success' });
+  }
+});
+
+// Language
+const allLanguages = ref([]);
+const language = ref('');
+const currentLanguage = ref('');
+
+watch(language, async (newLanguage, oldLanguage) => {
+  if (!oldLanguage) return;
+
+  const [error] = await cloudronModel.setLanguage(newLanguage);
+  if (error) {
+    console.error(error);
+    window.pankow.notify({ text: 'Failed to set language. Check logs', type: 'danger' });
+    language.value = currentLanguage.value;
+  } else {
+    currentLanguage.value = newLanguage;
+    window.pankow.notify({ text: 'Language changed', type: 'success' });
+  }
+});
+
+onMounted(async () => {
+  let [error, result] = await cloudronModel.getTimeZone();
+  if (error) return console.error(error);
+
+  timeZone.value = result;
+  currentTimeZone.value = result;
+
+  [error, result] = await cloudronModel.languages();
+  if (error) return console.error(error);
+
+  allLanguages.value = result.map(l => {
+    return {
+      id: l,
+      display: t(`lang.${l}`)
+    };
+  });
+
+  [error, result] = await cloudronModel.getLanguage();
+  if (error) return console.error(error);
+
+  language.value = result;
+  currentLanguage.value = result;
+});
+
+</script>
+
+<template>
+  <div>
+
+    <h1>{{ $t('settings.title') }}</h1>
+
+    <Section :title="$t('settings.appstoreAccount.title')">
+    </Section>
+
+    <Section :title="$t('settings.timezone.title')">
+      <p v-html="$t('settings.timezone.description', { timeZone: prettyTimeZone(timeZone) })"></p>
+      <Dropdown v-model="timeZone" :options="allTimezones" option-key="id" option-label="display" />
+    </Section>
+
+    <Section :title="$t('settings.language.title')">
+      <p>{{ $t('settings.language.description') }}</p>
+      <Dropdown v-model="language" :options="allLanguages" option-key="id" option-label="display" />
+    </Section>
+
+    <SystemUpdate />
+
+    <Section :title="$t('settings.privateDockerRegistry.title')">
+      <p v-html="$t('settings.privateDockerRegistry.description', { customAppsLink: 'https://docs.cloudron.io/custom-apps/tutorial/' })"></p>
+    </Section>
+  </div>
+</template>