added support for secureuser naming convention