diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js
index 0f07e884a1..577b116580 100644
--- a/public/src/client/topic/postTools.js
+++ b/public/src/client/topic/postTools.js
@@ -383,13 +383,13 @@ define('forum/topic/postTools', [
 							slug = '[[global:guest]]';
 						}
 					}
+					if (slug && slug !== '[[global:former_user]]' && slug !== '[[global:guest]]') {
+						slug = '@' + slug;
+					}
 					resolve(slug);
 				});
 				return;
 			}
-			if (post.length && post.attr('data-uid') !== '0') {
-				slug = '@' + slug;
-			}
 
 			resolve(slug);
 		});