diff --git a/vocodes/src/v2/api/w2l/GetW2lTemplate.ts b/vocodes/src/v2/api/w2l/GetW2lTemplate.ts
index d507111d51..d7a6dbb52e 100644
--- a/vocodes/src/v2/api/w2l/GetW2lTemplate.ts
+++ b/vocodes/src/v2/api/w2l/GetW2lTemplate.ts
@@ -11,6 +11,7 @@ export interface W2lTemplate {
   creator_user_token: string,
   creator_username: string,
   creator_display_name: string,
+  creator_gravatar_hash: string,
   updatable_slug: string,
   title: string,
   description_markdown: string,
diff --git a/vocodes/src/v2/view/w2l/w2l_template_view/W2lTemplateViewFc.tsx b/vocodes/src/v2/view/w2l/w2l_template_view/W2lTemplateViewFc.tsx
index f07e972d3c..d715a19652 100644
--- a/vocodes/src/v2/view/w2l/w2l_template_view/W2lTemplateViewFc.tsx
+++ b/vocodes/src/v2/view/w2l/w2l_template_view/W2lTemplateViewFc.tsx
@@ -14,6 +14,7 @@ import { HiddenIconFc } from '../../_icons/HiddenIcon';
 import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig';
 import { GetW2lTemplate, W2lTemplate } from '../../../api/w2l/GetW2lTemplate';
 import { GetW2lTemplateUseCount } from '../../../api/w2l/GetW2lTemplateUseCount';
+import { GravatarFc } from '../../_common/GravatarFc';
 
 interface EnqueueJobResponsePayload {
   success: boolean,
@@ -117,7 +118,6 @@ function W2lTemplateViewFc(props: Props) {
     return false;
   };
 
-  let creatorLink=`/profile/${w2lTemplate?.creator_username}`;
   let object : string|undefined = undefined;
   
   if (w2lTemplate?.maybe_image_object_name !== undefined && w2lTemplate?.maybe_image_object_name !== null) {
@@ -184,6 +184,23 @@ function W2lTemplateViewFc(props: Props) {
     );
   }
 
+  let creatorLink = <span />;
+
+  if (!!w2lTemplate?.creator_display_name) {
+    const creatorUrl = FrontendUrlConfig.userProfilePage(w2lTemplate?.creator_username);
+    creatorLink = (
+      <span>
+        <GravatarFc
+          size={15}
+          username={w2lTemplate.creator_display_name || ""} 
+          email_hash={w2lTemplate.creator_gravatar_hash || ""} 
+          />
+        &nbsp;
+        <Link to={creatorUrl}>{w2lTemplate.creator_display_name}</Link>
+      </span>
+    );
+  }
+
   let humanUseCount : string | number = 'Fetching...';
 
   if (w2lTemplateUseCount !== undefined && w2lTemplateUseCount !== null) {
@@ -338,7 +355,7 @@ function W2lTemplateViewFc(props: Props) {
           <tr>
             <th>Creator</th>
             <td>
-              <Link to={creatorLink}>{w2lTemplate?.creator_display_name}</Link>
+              {creatorLink}
             </td>
           </tr>
           <tr>