diff --git a/resources/twig/emails/registered-html.twig b/resources/twig/emails/registered-html.twig
index 39906cb802..c624ce2a46 100644
--- a/resources/twig/emails/registered-html.twig
+++ b/resources/twig/emails/registered-html.twig
@@ -1,18 +1,59 @@
-<p>Hey there!</p>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 
-<p>Welkome to Firefly III. Your registration has made it, and this email is here to confirm it.</p>
+</head>
+<body>
+    <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
+        Hey there,
+    </p>
+    <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
+        Welkome to <a style="color:#337ab7" href="{{ address }}">Firefly III</a>. Your registration has made it, and this email is here to confirm it. Yay!
 
-<p>Thanks for using Firefly!</p>
 
-<script type="application/ld+json">
-  {
-    "@context": "http://schema.org",
-    "@type": "EmailMessage",
-    "action": {
-      "@type": "ViewAction",
-      "url": "https://geld.nder.be/",
-      "name": "Visit Firefly III"
-    },
-    "description": "Visit Firefly III"
+
+    </p>
+
+
+    <ul>
+        <li style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
+            If you have forgotten your password already, please reset it using
+            <a style="color:#337ab7" href="{{ address }}password/email">the password reset tool</a>.
+        </li>
+        <li style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
+            There is a help-icon in the top right corner of each page. If you need help, click it!
+        </li>
+        <li style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
+            If you haven't already, please read the
+            <a style="color:#337ab7" href="https://github.com/JC5/firefly-iii/wiki/First-use">first use guide</a> and the
+            <a style="color:#337ab7" href="https://github.com/JC5/firefly-iii/wiki/full-description">full description</a>.
+        </li>
+
+    </ul>
+
+    <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
+        Enjoy!
+    </p>
+
+
+    <script type="application/ld+json">
+{
+  "@context": "http://schema.org",
+  "@type": "EmailMessage",
+  "description": "Visit Firefly III",
+  "potentialAction": {
+    "@type": "ViewAction",
+    "target": "https://geld.nder.be/",
+    "name": "Watch movie"
+  },
+  "publisher": {
+    "@type": "Organization",
+    "name": "Firefly III",
+    "url": "https://geld.nder.be"
   }
+}
 </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/resources/twig/emails/registered.twig b/resources/twig/emails/registered.twig
index 4550f79f9d..1d4f39cdbf 100644
--- a/resources/twig/emails/registered.twig
+++ b/resources/twig/emails/registered.twig
@@ -1,5 +1,19 @@
-Hey there!
+Hey there,
 
-Welkome to Firefly III. Your registration has made it, and this email is here to confirm it.
+Welkome to Firefly III. Your registration has made it, and this email is here to confirm it. Yay!
 
-Thanks for using Firefly!
+* If you have forgotten your password already, please reset it using the password reset tool.
+* There is a help-icon in the top right corner of each page. If you need help, click it!
+* If you haven't already, please read the first use guide and the full description.
+
+Enjoy!
+
+Firefly III:
+{{ address }}
+
+Password reset:
+{{ address }}password/email
+
+Documentation:
+https://github.com/JC5/firefly-iii/wiki/First-use
+https://github.com/JC5/firefly-iii/wiki/full-description
\ No newline at end of file
