Change secondary user groups as well
Improve this a little bit
Readd back in time values... They're nice to see