diff --git a/after/syntax/gitlab.vim b/after/syntax/gitlab.vim
index 2a69302..2c6c38e 100644
--- a/after/syntax/gitlab.vim
+++ b/after/syntax/gitlab.vim
@@ -2,7 +2,7 @@ if filereadable($VIMRUNTIME . '/syntax/markdown.vim')
   source $VIMRUNTIME/syntax/markdown.vim
 endif
 
-syntax match Username "@\w\+"
+syntax match Username "@\S*"
 syntax match Date "\v\d+\s+\w+\s+ago"
 syntax match ChevronDown ""
 syntax match ChevronRight ""
diff --git a/lua/gitlab/utils/init.lua b/lua/gitlab/utils/init.lua
index 7778502..2fcffa7 100644
--- a/lua/gitlab/utils/init.lua
+++ b/lua/gitlab/utils/init.lua
@@ -2,8 +2,8 @@ local Job = require("plenary.job")
 local M = {}
 
 M.get_colors_for_group = function(group)
-  local normal_fg = vim.fn.synIDattr(vim.fn.hlID(group), "fg")
-  local normal_bg = vim.fn.synIDattr(vim.fn.hlID(group), "bg")
+  local normal_fg = vim.fn.synIDattr(vim.fn.synIDtrans((vim.fn.hlID(group))), "fg")
+  local normal_bg = vim.fn.synIDattr(vim.fn.synIDtrans((vim.fn.hlID(group))), "bg")
   return { fg = normal_fg, bg = normal_bg }
 end