Fixed some missing pieces for the SysAdmin feature

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>