diff --git a/server.js b/server.js
index f8f256f..31df5ca 100644
--- a/server.js
+++ b/server.js
@@ -3,7 +3,7 @@ import express from 'express';
 import cors from 'cors';
 import { create } from 'express-handlebars';
 
-import { domain, account, simpleLogger, actorInfo } from './src/util.js';
+import { domain, account, simpleLogger, actorInfo, replaceEmptyText } from './src/util.js';
 import session, { isAuthenticated } from './src/session-auth.js';
 import * as bookmarksDb from './src/bookmarks-db.js';
 import * as apDb from './src/activity-pub-db.js';
@@ -97,6 +97,9 @@ const hbs = create({
     eq(a, b, options) {
       return a === b ? options.fn(this) : options.inverse(this);
     },
+    setTitle(item) {
+      return replaceEmptyText(item.title, item.url);
+    },
   },
   partialsDir: './src/pages/partials',
   extname: '.hbs',
diff --git a/src/activitypub.js b/src/activitypub.js
index 1f81fac..c709936 100644
--- a/src/activitypub.js
+++ b/src/activitypub.js
@@ -2,7 +2,7 @@ import fetch from 'node-fetch';
 import crypto from 'crypto';
 
 import { signedGetJSON, signedPostJSON } from './signature.js';
-import { actorInfo, actorMatchesUsername } from './util.js';
+import { actorInfo, actorMatchesUsername, replaceEmptyText } from './util.js';
 
 function getGuidFromPermalink(urlString) {
   return urlString.match(/(?:\/m\/)([a-zA-Z0-9+/]+)/)[1];
@@ -34,9 +34,10 @@ export function createNoteObject(bookmark, account, domain) {
     type: 'Note',
     published: d.toISOString(),
     attributedTo: `https://${domain}/u/${account}`,
-    content: `
-      <strong><a href="${bookmark.url}">${bookmark.title}</a></strong><br/>
-      ${bookmark.description?.replace('\n', '<br/>') || ''}`,
+    content: `<strong><a href="${bookmark.url}" rel="nofollow noopener noreferrer" target="_blank">${replaceEmptyText(
+      bookmark.title,
+      bookmark.url,
+    )}</a></strong><br/>${bookmark.description?.trim().replace('\n', '<br/>') || ''}`,
     to: [`https://${domain}/u/${account}/followers/`, 'https://www.w3.org/ns/activitystreams#Public'],
     tag: [],
   };
diff --git a/src/pages/bookmark.hbs b/src/pages/bookmark.hbs
index d77d1f2..b4bf040 100644
--- a/src/pages/bookmark.hbs
+++ b/src/pages/bookmark.hbs
@@ -1,7 +1,7 @@
 <h1 class="bookmark-permalink-title">
   <a href="{{bookmark.url}}">
-    {{bookmark.title}} <span class="external-link">↗</span>
-  </a>
+   {{setTitle bookmark}}<span class="external-link">↗</span>
+   </a>
 </h1>
 
 {{> show_bookmark bookmark=bookmark permalink=true}}
diff --git a/src/pages/bookmarks-xml.hbs b/src/pages/bookmarks-xml.hbs
index 644f1bd..dfe78e1 100644
--- a/src/pages/bookmarks-xml.hbs
+++ b/src/pages/bookmarks-xml.hbs
@@ -9,12 +9,14 @@
   </author>
   {{#each bookmarks}}
     <entry>
-      <title>{{title}}</title>
+      <title>{{setTitle this}}</title>
       <link rel="alternate" href="{{url}}"/>
       <id>{{projectUrl}}/bookmark/{{id}}</id>
       <updated>{{created_at}}</updated>
-      {{#if description}}
+      {{#if description }}
         <summary type="html">{{description}}</summary>
+      {{ else }}
+        <summary type="html"> </summary>
       {{/if}}
       {{#each tag_array}}
         <category term="{{this}}" />
diff --git a/src/pages/partials/edit_bookmark.hbs b/src/pages/partials/edit_bookmark.hbs
index e2c8fd0..1e65261 100644
--- a/src/pages/partials/edit_bookmark.hbs
+++ b/src/pages/partials/edit_bookmark.hbs
@@ -9,9 +9,11 @@
       </label>
       <input
         id="bookmark_url"
-        type="text"
+        type="url"
         name="url"
         value="{{bookmark.url}}"
+        required
+        aria-required="true"
       />
     </div>
     <div class="form-group">
diff --git a/src/pages/partials/show_bookmark.hbs b/src/pages/partials/show_bookmark.hbs
index 54f7d5f..972dc5d 100644
--- a/src/pages/partials/show_bookmark.hbs
+++ b/src/pages/partials/show_bookmark.hbs
@@ -2,7 +2,7 @@
   {{^if permalink}}
     <div class="headline">
       <a href="{{bookmark.url}}">
-        {{bookmark.title}}
+        {{setTitle bookmark}}
       </a>
     </div>
   {{/if}}
diff --git a/src/routes/bookmark.js b/src/routes/bookmark.js
index ffa9224..9fe7c6d 100644
--- a/src/routes/bookmark.js
+++ b/src/routes/bookmark.js
@@ -171,8 +171,8 @@ router.post('/multiadd', isAuthenticated, async (req, res) => {
 
     await bookmarksDb.createBookmark({
       url: link,
-      title: meta.result.ogTitle,
-      description: meta.result.ogDescription || ' ', // add *something*, even if ogDesc is empty (keeps Atom feed validation happy)
+      title: meta.result?.ogTitle,
+      description: (meta.result && meta.result.ogDescription) || ' ', // add *something*, even if ogDesc is empty (keeps Atom feed validation happy)
     });
   });
 
@@ -248,7 +248,7 @@ router.post('/:id?', isAuthenticated, async (req, res) => {
     bookmark = await bookmarksDb.createBookmark({
       // STRONG PARAMETERS
       url: mergedObject.url.trim(),
-      title: mergedObject.title?.trim() || 'Untitled',
+      title: mergedObject.title?.trim(),
       description: mergedObject.description?.trim() || '',
       tags,
     });
diff --git a/src/util.js b/src/util.js
index 71c8088..0a41a4d 100644
--- a/src/util.js
+++ b/src/util.js
@@ -116,6 +116,13 @@ export function actorMatchesUsername(actor, username) {
   return actorAccount === actorResult[3] && actorDomain === actorResult[1];
 }
 
+export function replaceEmptyText(currentValue, defaultValue) {
+  if (!currentValue || currentValue?.trim().replace(/\n/g, '') === '') {
+    return defaultValue;
+  }
+  return currentValue;
+}
+
 export function simpleLogger(req, res, next) {
   // middleware function
   const currentDatetime = new Date();