closes #304
merged users.tpl