diff --git a/fuglane.user.js b/fuglane.user.js
index d62d974..8d76caf 100644
--- a/fuglane.user.js
+++ b/fuglane.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         Fuglane - Issue links
 // @namespace    http://tampermonkey.net/
-// @version      1.3.5
+// @version      1.3.6
 // @description  Replace NTNU issue numbers, change numbers and upn's with clickable links to TopDesk
 // @author       Øyvind Nilsen (on@ntnu.no)
 // @match        https://fuglane.it.ntnu.no/display/*
@@ -23,7 +23,7 @@
         if (node.nodeType === Node.TEXT_NODE) {
             const incidentRegex = /(NTNU[0-9]{7})/gi;
             const changeRegex = /(NTNU_C[0-9]{7})/gi;
-            const emailRegex = /([a-z0-9-_]{2,40})(?:@ntnu\.no)/gi;
+            const emailRegex = /(?<![a-z0-9-_.])([a-z0-9-_]{2,40})(?:@ntnu\.no)/gi;
             const text = node.textContent;
 
             //console.log("TEXT: " + text);