Improved user template