fixed users.tpl from fail merge earlier