diff --git a/src/main.rs b/src/main.rs
index c0f40d82..a1c5a2b2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -331,17 +331,25 @@ pub struct Config {
 fn load_templates(path: String) -> Handlebars {
     let mut hb = Handlebars::new();
 
+    macro_rules! reg {
+        ($name:expr) => {
+            let template = include_str!(concat!("static/templates/", $name, ".hbs"));
+            hb.register_template_string($name, template).unwrap();
+        };
+    }
+
     // First register default templates here (use include_str?)
-    hb.register_template_string("tpl_1", "Good afternoon, {{name}}")
-        .unwrap();
+    reg!("email_invite_accepted");
+    reg!("email_invite_confirmed");
+    reg!("email_pw_hint_none");
+    reg!("email_pw_hint_some");
+    reg!("email_send_org_invite");
 
     // And then load user templates to overwrite the defaults
     // Use .hbs extension for the files
     // Templates get registered with their relative name
     hb.register_templates_directory(".hbs", path).unwrap();
 
-    // println!("{}", hb.render("tpl_1", &json!({"name": "Dani"})).unwrap());
-
     hb
 }