diff --git a/js/controller/ActivityController.js b/js/controller/ActivityController.js
index 847a36976..0870170b4 100644
--- a/js/controller/ActivityController.js
+++ b/js/controller/ActivityController.js
@@ -263,7 +263,23 @@ class ActivityController {
 	}
 
 	parseMessage(subject, parameters) {
-		OCA.Activity.RichObjectStringParser._userLocalTemplate = '<span class="avatar-name-wrapper"><avatar ng-attr-contactsmenu ng-attr-tooltip ng-attr-user="{{ id }}" ng-attr-displayname="{{name}}" ng-attr-size="16"></avatar> {{ name }}</span>';
+		if (typeof OCA.Activity.Templates !== 'undefined') {
+			OCA.Activity.Templates.userLocal = {"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+				var helper;
+				// Compiled handlesbars template
+				// '<span class="avatar-name-wrapper"><avatar ng-attr-contactsmenu ng-attr-tooltip ng-attr-user="{{ id }}" ng-attr-displayname="{{name}}" ng-attr-size="16"></avatar> {{ name }}</span>';
+				return "<span class=\"avatar-name-wrapper\"><avatar ng-attr-contactsmenu ng-attr-tooltip ng-attr-user=\""
+					+ container.escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"id","hash":{},"data":data}) : helper)))
+					+ "\" ng-attr-displayname=\""
+					+ container.escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"name","hash":{},"data":data}) : helper)))
+					+ "\" ng-attr-size=\"16\"></avatar> "
+					+ container.escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"name","hash":{},"data":data}) : helper)))
+					+ "</span>";
+			},"useData":true};
+		} else {
+			OCA.Activity.RichObjectStringParser._userLocalTemplate = '<span class="avatar-name-wrapper"><avatar ng-attr-contactsmenu ng-attr-tooltip ng-attr-user="{{ id }}" ng-attr-displayname="{{name}}" ng-attr-size="16"></avatar> {{ name }}</span>';
+		}
+
 		return OCA.Activity.RichObjectStringParser.parseMessage(subject, parameters);
 	}
 
diff --git a/templates/main.php b/templates/main.php
index cc6046b6c..288c518c6 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -24,6 +24,9 @@
 use OCP\Util;
 
 Util::addScript('activity', 'richObjectStringParser');
+Util::addScript('activity', 'templates');
+Util::addScript('activity', 'script');
+
 Util::addStyle('activity', 'style');
 Util::addStyle('comments', 'comments');
 Util::addScript('oc-backbone-webdav');