diff --git a/CHANGELOG.md b/CHANGELOG.md
index d74b173d..17d6454b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v0.6.1
+## Bug fixes
+- Fixes a bug that would show wrong comments under a trail
+- Fixes an overflow issue in list views
+- Settings are now created properly when signing up with OAuth
+- Fixes a bug that caused properly named trails to get a generic name
+
 # v0.6.0
 ## Features
 - You can now share trails with other users by selecting "Share" from the trail contextmenu. You can set the permission level as "View" or "Edit".
diff --git a/db/main.go b/db/main.go
index 5323ed4f..8366d171 100644
--- a/db/main.go
+++ b/db/main.go
@@ -54,6 +54,22 @@ func main() {
 			}
 		}
 
+		collection, err := app.Dao().FindCollectionByNameOrId("settings")
+		if err != nil {
+			return err
+		}
+
+		settings := models.NewRecord(collection)
+
+		settings.Set("language", "en")
+		settings.Set("unit", "metric")
+		settings.Set("mapFocus", "trails")
+		settings.Set("user", record.Id)
+
+		if err := app.Dao().SaveRecord(settings); err != nil {
+			return err
+		}
+
 		return nil
 	})
 
diff --git a/docs/package-lock.json b/docs/package-lock.json
index ab5c9eb2..ea4d4833 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "docs",
-  "version": "0.0.1",
+  "version": "0.6.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "docs",
-      "version": "0.0.1",
+      "version": "0.6.1",
       "dependencies": {
         "@astrojs/check": "^0.7.0",
         "@astrojs/node": "^8.2.6",
diff --git a/docs/package.json b/docs/package.json
index c6d3fa55..bb9d36d6 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "docs",
   "type": "module",
-  "version": "0.0.1",
+  "version": "0.6.1",
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
diff --git a/docs/src/components/footer.astro b/docs/src/components/footer.astro
index 9784743e..222cc641 100644
--- a/docs/src/components/footer.astro
+++ b/docs/src/components/footer.astro
@@ -111,7 +111,7 @@ const isNotHomepage = Astro.props.slug !== "";
                         class="fill-primary dark:fill-white"
                         font-size="0.75rem"
                     >
-                        v0.6.0
+                        v0.6.1
                     </text>
                 </svg>
             </div>
diff --git a/docs/src/content/docs/getting-started/changelog.md b/docs/src/content/docs/getting-started/changelog.md
index 843bcea6..39e61af5 100644
--- a/docs/src/content/docs/getting-started/changelog.md
+++ b/docs/src/content/docs/getting-started/changelog.md
@@ -3,6 +3,13 @@ title: Changelog
 description: What changed in the last patch?
 ---
 
+## v0.6.1
+### Bug fixes
+- Fixes a bug that would show wrong comments under a trail
+- Fixes an overflow issue in list views
+- Settings are now created properly when signing up with OAuth
+- Fixes a bug that caused properly named trails to get a generic name
+
 ## v0.6.0
 ### Features
 - You can now share trails with other users by selecting "Share" from the trail contextmenu. You can set the permission level as "View" or "Edit".
diff --git a/web/package-lock.json b/web/package-lock.json
index 64cfe614..166d7e9f 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "wanderer",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "wanderer",
-      "version": "0.6.0",
+      "version": "0.6.1",
       "dependencies": {
         "@fortawesome/fontawesome-free": "^6.5.1",
         "@sveltejs/adapter-node": "^4.0.1",
diff --git a/web/package.json b/web/package.json
index 92ed3e2a..98e3aa96 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wanderer",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "private": true,
   "scripts": {
     "dev": "vite dev",
diff --git a/web/src/lib/components/logo/logo_text_light_with_version.svelte b/web/src/lib/components/logo/logo_text_light_with_version.svelte
index 4426e66a..19debf45 100644
--- a/web/src/lib/components/logo/logo_text_light_with_version.svelte
+++ b/web/src/lib/components/logo/logo_text_light_with_version.svelte
@@ -95,5 +95,5 @@
         d="M43.857 43.3045C44.0569 43.0652 44.4246 43.0652 44.6245 43.3045L46.6259 45.7008C46.8978 46.0263 46.6663 46.5213 46.2421 46.5213H42.2394C41.8152 46.5213 41.5837 46.0263 41.8556 45.7008L43.857 43.3045Z"
         fill="#242734"
     />
-    <text x="178" y="64" fill="white" font-size="0.75rem">v0.6.0</text>
+    <text x="178" y="64" fill="white" font-size="0.75rem">v0.6.1</text>
 </svg>
diff --git a/web/src/lib/stores/user_store.ts b/web/src/lib/stores/user_store.ts
index 29bfb31c..f65a878e 100644
--- a/web/src/lib/stores/user_store.ts
+++ b/web/src/lib/stores/user_store.ts
@@ -19,8 +19,7 @@ export async function users_create(user: User) {
 
     const createdUser: User = await r.json();
 
-    const settings = new Settings("metric", "en", "trails", createdUser.id!)
-    await settings_create(settings);
+    return createdUser;
 }
 
 export async function users_search(q: string) {